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

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)

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)

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;