fix possible unterminated string.

diff --git a/ChangeLog b/ChangeLog
index 5e01e98e5d02d866c3c5f8c6eefdede162f401e2..92042d117ed3623e155c46c8c3e2da0d16c13614 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+       * make sure that we nul terminate desc (Ryoji Kanai)
+
        * don't process elf notes multiple times
 
        * allow -z to report empty compressed files

diff --git a/src/apprentice.c b/src/apprentice.c
index b32c1f876817ff685bbc0253ca24397b1c6b6ffb..375f23b396b11c57df0bca24faddcde7b114ded3 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -46,7 +46,7 @@
 #endif
 
 #ifndef        lint
-FILE_RCSID("@(#)$Id: apprentice.c,v 1.95 2006/06/08 22:48:51 christos Exp $")
+FILE_RCSID("@(#)$Id: apprentice.c,v 1.96 2006/10/27 14:51:28 christos Exp $")
 #endif /* lint */
 
 #define        EATAB {while (isascii((unsigned char) *l) && \
@@ -835,8 +835,9 @@ GetDesc:
                m->nospflag = 1;
        } else
                m->nospflag = 0;
-       for (i = 0; (m->desc[i++] = *l++) != '\0' && i < MAXDESC; )
+       for (i = 0; (m->desc[i++] = *l++) != '\0' && i < sizeof(m->desc); )
                continue;
+       m->desc[sizeof(m->desc) - 1] = '\0';
 
         /*
         * We only do this check while compiling, or if any of the magic