fix possible infinite loop introduced in r3717 (bb#899)

git-svn: trunk@3754
17 years ago · 1f723be751
parent 6f6fc585f5
commit 1f723be751
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Thu Apr  3 13:52:19 CEST 2008 (tk)
+----------------------------------
+  * libclamav/mspack.c: fix possible infinite loop introduced in r3717 (bb#899)
+
 Wed Apr  2 22:54:23 CEST 2008 (tk)
 ----------------------------------
  * libclamav/scanners.c: cl_scandesc: check if limits is not null (bb#907)
--- a/libclamav/mspack.c
+++ b/libclamav/mspack.c
@ -104,7 +104,7 @@ static const unsigned short mszip_bit_mask_tab[17] = {
      if (mszip_read_input(zip)) return zip->error;                      \
      i_ptr = zip->i_ptr;                                               \
      i_end = zip->i_end;                                               \
-      if(i_ptr == i_end) break;						\
+      if(i_ptr == i_end) return CL_EFORMAT;				\
    }                                                                   \
    bit_buffer |= *i_ptr++ << bits_left; bits_left  += 8;               \
  }                                                                     \