fix incorrect calculation of maxshift in some cases (bb#390)

git-svn: trunk@2921
18 years ago · 95b0d95e8c
parent 3c882206b1
commit 95b0d95e8c
2 changed files with 9 additions and 1 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Thu Mar  8 22:45:39 CET 2007 (tk)
+---------------------------------
+  * libclamav/matcher-ac.c: fix incorrect calculation of maxshift in some cases
+			    (bb#390)
+
 Thu Mar  8 20:34:36 EET 2007 (edwin)
 ---------------------------------
  * contrib/entitynorm/: fix entity list generator to support more entities,
--- a/libclamav/matcher-ac.c
+++ b/libclamav/matcher-ac.c
@ -480,7 +480,10 @@ int cli_ac_scanbuff(const unsigned char *buffer, unsigned int length, const char
 			    }

 			    if(found) {
-				mdata->maxshift[pt->sigid - 1] = mdata->partoff[pt->sigid - 1][j] + pt->maxdist - curroff;
+				if(pt->maxdist)
+				    mdata->maxshift[pt->sigid - 1] = mdata->partoff[pt->sigid - 1][j] + pt->maxdist - curroff;
+				else
+				    mdata->maxshift[pt->sigid - 1] = -1;

 				mdata->partoff[pt->sigid - 1][0] = curroff + pt->length;
 				mdata->offcnt[pt->sigid - 1] = 1;