@@ -1,3 +1,8 @@

+Mon Aug 16 18:52:42 CEST 2004 (tk)

+----------------------------------

+  * libclamav: cli_memstr: fix bounds error (thanks to Nigel) and move to

+	       others.c

+

 Sun Aug 15 02:19:54 CEST 2004 (tk)

 ----------------------------------

   * freshclam: try all IP addresses provided by gethostbyname() in single

@@ -473,3 +473,35 @@ int32_t cli_readint32(const char *buff)

     return ret;

 }

+

+int cli_memstr(const char *haystack, int hs, const char *needle, int ns)

+{

+	const char *pt, *hay;

+	int n;

+

+

+    if(hs < ns)

+	return 0;

+

+    if(haystack == needle)

+	return 1;

+

+    if(!memcmp(haystack, needle, ns))

+	return 1;

+

+    pt = hay = haystack;

+    n = hs;

+

+    while((pt = memchr(hay, needle[0], n)) != NULL) {

+	n = (int) pt - (int) hay;

+	if(n < ns)

+	    break;

+

+	if(!memcmp(pt, needle, ns))

+	    return 1;

+

+	hay = pt;

+    }

+

+    return 0;

+}

@@ -37,5 +37,6 @@ int32_t cli_readint32(const char *buff);

 char *cli_gentemp(const char *dir);

 unsigned int cli_rndnum(unsigned int max);

 char *cli_md5file(const char *filename);

+int cli_memstr(const char *haystack, int hs, const char *needle, int ns);

 #endif

@@ -141,25 +141,6 @@ static int cli_ddump(int desc, int offset, int size, const char *file)

     return 0;

 }

-int cli_memstr(const char *haystack, int hs, const char *needle, int ns)

-{

-	const char *pt;

-	int n;

-

-    if(!memcmp(haystack, needle, ns))

-	return 1;

-

-    pt = haystack;

-    n = hs;

-    while(n && (pt = memchr(pt, needle[0], n))) {

-	n--;

-	if(!memcmp(pt, needle, ns))

-	    return 1;

-    }

-

-    return 0;

-}

-

 int cli_scanpe(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)

 {

 	uint16_t e_magic; /* DOS signature ("MZ") */