[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 550dc2b32160255a76fd5b7ea65765fc9a5912d6
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Mon Sep 7 15:04:28 2009 +0200

    libclamav/matcher-bm.c: fix uninitialized value warning

diff --git a/ChangeLog b/ChangeLog
index 8d67218..3bcf18e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  7 15:03:11 CEST 2009 (tk)
+----------------------------------
+ * libclamav/matcher-bm.c: fix uninitialized value warning
+
 Mon Sep  7 03:45:18 CEST 2009 (acab)
 ------------------------------------
  * libclamav/scanners.c: properly scan text files with a mail container
diff --git a/libclamav/matcher-bm.c b/libclamav/matcher-bm.c
index 44f6083..87ca7fa 100644
--- a/libclamav/matcher-bm.c
+++ b/libclamav/matcher-bm.c
@@ -277,7 +277,7 @@ int cli_bm_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 	    if(p && p->cnt == 1 && p->pattern0 != prefix) {
 		if(offdata) {
 		    off = offset + i - BM_MIN_LENGTH + BM_BLOCK_SIZE;
-		    for(; off >= offdata->offtab[offdata->pos] && offdata->pos < offdata->cnt; offdata->pos++);
+		    for(; offdata->pos < offdata->cnt && off >= offdata->offtab[offdata->pos]; offdata->pos++);
 		    if(offdata->pos == offdata->cnt || off >= offdata->offtab[offdata->pos])
 			return CL_CLEAN;
 		    i += offdata->offtab[offdata->pos] - off;
@@ -372,7 +372,7 @@ int cli_bm_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 
 	if(offdata) {
 	    off = offset + i - BM_MIN_LENGTH + BM_BLOCK_SIZE;
-	    for(; off >= offdata->offtab[offdata->pos] && offdata->pos < offdata->cnt; offdata->pos++);
+	    for(; offdata->pos < offdata->cnt && off >= offdata->offtab[offdata->pos]; offdata->pos++);
 	    if(offdata->pos == offdata->cnt || off >= offdata->offtab[offdata->pos])
 		return CL_CLEAN;
 	    i += offdata->offtab[offdata->pos] - off;

-- 
Debian repository for ClamAV