Allow empty magic files

diff --git a/src/apprentice.c b/src/apprentice.c
index e51ece01287a37d1d579f9aaf235236e2c0eda3d..02d11a31d0794644918f729646d1e8ace662371c 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -47,7 +47,7 @@
 #endif
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.114 2008/02/11 01:36:08 rrt Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.115 2008/02/11 22:12:24 rrt Exp $")
 #endif /* lint */
 
 #define        EATAB {while (isascii((unsigned char) *l) && \
@@ -278,7 +278,7 @@ apprentice_1(struct magic_set *ms, const char *fn, int action,
 
        mapped = rv;
             
-       if (magic == NULL || nmagic == 0) {
+       if (magic == NULL) {
                file_delmagic(magic, mapped, nmagic);
                return -1;
        }
@@ -1773,7 +1773,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
                file_error(ms, errno, "cannot stat `%s'", dbname);
                goto error;
        }
-       if (st.st_size < 16) {
+       if (st.st_size < 8) {
                file_error(ms, 0, "file `%s' is too small", dbname);
                goto error;
        }
@@ -1818,7 +1818,9 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
                    VERSIONNO, dbname, version);
                goto error;
        }
-       *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic)) - 1;
+       *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
+       if (*nmagicp > 0)
+               nmagicp--;
        (*magicp)++;
        if (needsbyteswap)
                byteswap(*magicp, *nmagicp);