[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit c48cee3a1098e908c20d4ffe6160c1c2b7da104d
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:48 2008 +0100

    Revert "fix possible infinite loop introduced in r3717 (bb#899)"
    
    This reverts commit 39c20b13720ffec4884bbd48aa328601e273e407.

diff --git a/ChangeLog b/ChangeLog
index 34579cb..e69efae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-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)
diff --git a/libclamav/mspack.c b/libclamav/mspack.c
index 22dbc0d..24b5b2b 100644
--- 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) return CL_EFORMAT;				\
+      if(i_ptr == i_end) break;						\
     }                                                                   \
     bit_buffer |= *i_ptr++ << bits_left; bits_left  += 8;               \
   }                                                                     \

-- 
Debian repository for ClamAV