make sure that type is initialized even in the out of memory case.

diff --git a/src/encoding.c b/src/encoding.c
index ee5b571623257e7c4e2125fe16e9f268997ecd87..ca55720b0f3c174a62c6a3d3a7e43333f537f9be 100644 (file)
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: encoding.c,v 1.5 2010/07/21 16:47:17 christos Exp $")
+FILE_RCSID("@(#)$File: encoding.c,v 1.6 2011/12/08 12:38:24 rrt Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -71,6 +71,7 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
        int rv = 1, ucs_type;
        unsigned char *nbuf = NULL;
 
+       *type = "text";
        mlen = (nbytes + 1) * sizeof(nbuf[0]);
        if ((nbuf = CAST(unsigned char *, calloc((size_t)1, mlen))) == NULL) {
                file_oomem(ms, mlen);
@@ -82,7 +83,6 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
                goto done;
        }
 
-       *type = "text";
        if (looks_ascii(buf, nbytes, *ubuf, ulen)) {
                DPRINTF(("ascii %" SIZE_T_FORMAT "u\n", *ulen));
                *code = "ASCII";