[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 417b7509f6162b2104eb9b1b42cf2e70a708cef5
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Tue Sep 29 21:48:07 2009 +0200

    libclamav/matcher-ac.c: fix matching of logical sigs (bb#1707)

diff --git a/ChangeLog b/ChangeLog
index e500f86..04d0c69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 29 21:40:29 CEST 2009 (tk)
+----------------------------------
+ * libclamav/matcher-ac.c: fix matching of logical sigs (bb#1707)
+			   Reported by Thiyaga <mthiyaga*corp.untd.com>
+
 Mon Sep 28 21:41:47 CEST 2009 (tk)
 ----------------------------------
  * libclamav/readdb.c: fix handling of broken .ldb sigs (bb#1701)
diff --git a/libclamav/matcher-ac.c b/libclamav/matcher-ac.c
index ed70693..f1a2537 100644
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@@ -1171,7 +1171,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 				} else { /* !pt->type */
 				    if(pt->lsigid[0]) {
 					mdata->lsigcnt[pt->lsigid[1]][pt->lsigid[2]]++;
-					pt = pt->next;
+					pt = pt->next_same;
 					continue;
 				    }
 
@@ -1184,7 +1184,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 					newres->next = *res;
 					*res = newres;
 
-					pt = pt->next;
+					pt = pt->next_same;
 					continue;
 				    } else {
 					if(virname)
@@ -1213,7 +1213,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 			    } else {
 				if(pt->lsigid[0]) {
 				    mdata->lsigcnt[pt->lsigid[1]][pt->lsigid[2]]++;
-				    pt = pt->next;
+				    pt = pt->next_same;
 				    continue;
 				}
 
@@ -1226,7 +1226,7 @@ int cli_ac_scanbuff(const unsigned char *buffer, uint32_t length, const char **v
 				    newres->next = *res;
 				    *res = newres;
 
-				    pt = pt->next;
+				    pt = pt->next_same;
 				    continue;
 				} else {
 				    if(virname)
diff --git a/libclamav/others.h b/libclamav/others.h
index 0661ae6..9cef29e 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -50,7 +50,7 @@
  * in re-enabling affected modules.
  */
 
-#define CL_FLEVEL 48
+#define CL_FLEVEL 49
 #define CL_FLEVEL_DCONF	CL_FLEVEL
 
 extern uint8_t cli_debug_flag;

-- 
Debian repository for ClamAV