[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 46869e6b916c3659e2dd0078b30283444c29aff1
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:33 2008 +0100

    Revert "downgrade some error messages (bb#911)"
    
    This reverts commit 3f51499dacd826bebb95a34f15069748ac35d579.

diff --git a/ChangeLog b/ChangeLog
index 9fa8887..493e4fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Apr 30 14:15:53 CEST 2008 (tk)
-----------------------------------
-  * libclamav/mspack.c: downgrade some error messages (bb#911)
-
 Wed Apr 30 12:35:29 CEST 2008 (tk)
 ----------------------------------
   * clamav-milter: retrieve db version from daily.cld (bb#942)
diff --git a/libclamav/mspack.c b/libclamav/mspack.c
index 7955083..6710e5e 100644
--- a/libclamav/mspack.c
+++ b/libclamav/mspack.c
@@ -125,7 +125,7 @@ static const unsigned short mszip_bit_mask_tab[17] = {
 
 static int mszip_read_input(struct mszip_stream *zip) {
   int nread = zip->read_cb ? zip->read_cb(zip->file, zip->inbuf, (int)zip->inbuf_size) : cli_readn(zip->fd, zip->inbuf, (int)zip->inbuf_size);
-  if (nread < 0) return zip->error = CL_EFORMAT;
+  if (nread < 0) return zip->error = CL_EIO;
 
   zip->i_ptr = &zip->inbuf[0];
   zip->i_end = &zip->inbuf[nread];
@@ -749,7 +749,7 @@ void mszip_free(struct mszip_stream *zip) {
 
 static int lzx_read_input(struct lzx_stream *lzx) {
   int bread = lzx->read_cb ? lzx->read_cb(lzx->file, &lzx->inbuf[0], (int)lzx->inbuf_size) : cli_readn(lzx->fd, &lzx->inbuf[0], (int)lzx->inbuf_size);
-  if (bread < 0) return lzx->error = CL_EFORMAT;
+  if (bread < 0) return lzx->error = CL_EIO;
 
   /* huff decode's ENSURE_BYTES(16) might overrun the input stream, even
    * if those bits aren't used, so fake 2 more bytes */
@@ -1577,7 +1577,7 @@ void lzx_free(struct lzx_stream *lzx) {
 
 static int qtm_read_input(struct qtm_stream *qtm) {
   int nread = qtm->read_cb ? qtm->read_cb(qtm->file, &qtm->inbuf[0], (int)qtm->inbuf_size) : cli_readn(qtm->fd, &qtm->inbuf[0], (int)qtm->inbuf_size);
-  if (nread < 0) return qtm->error = CL_EFORMAT;
+  if (nread < 0) return qtm->error = CL_EIO;
 
   qtm->i_ptr = &qtm->inbuf[0];
   qtm->i_end = &qtm->inbuf[nread];

-- 
Debian repository for ClamAV