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

+Tue Jun 26 10:19:00 CEST 2007 (edwin)

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

+  * libclamav/regex_list.c:	fix false substring matches, related to bug

+  #534, #551.

+

 Tue Jun 26 07:51:36 BST 2007 (njh)

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

   * clamav-milter:	Improve yesterday's fix to ensure that servers are marked

@@ -48,7 +48,7 @@ int domainlist_match(const struct cl_engine* engine,const char* real_url,const c

 {

 	const char* info;

 	int rc = engine->domainlist_matcher ? regex_list_match(engine->domainlist_matcher,real_url,display_url,hostOnly,&info,0) : 0;

-	if(rc && info && info[0]) {/*match successful, and has custom flags*/

+	if(rc && info && info[0] && info[0] != ':') {/*match successful, and has custom flags*/

 		if(strlen(info)==3 && isxdigit(info[0]) && isxdigit(info[1]) && isxdigit(info[2])) {

 			unsigned short notwantedflags=0;

 			sscanf(info,"%hx",&notwantedflags);

@@ -277,8 +277,20 @@ int regex_list_match(struct regex_matcher* matcher,const char* real_url,const ch

 				/* needs to match terminating \0 too */

 				rc = cli_ac_scanbuff((unsigned char*)buffer,buffer_len+1,info, &matcher->root_hosts[i] ,&mdata,0,0,0,-1,NULL);

 				cli_ac_freedata(&mdata);

-				if(rc)

-					break;

+				if(rc) {

+					const char* matched = strchr(*info,':');	

+					const size_t match_len = matched ? strlen(matched+1) : 0;

+					if(match_len == buffer_len || /* full match */

+					        (match_len < buffer_len &&

+						buffer[buffer_len-match_len-1]=='.') 

+						/* subdomain matched*/) {

+

+						cli_dbgmsg("Got a match:%s with %s\n",buffer,*info);

+						break;

+					}

+					cli_dbgmsg("Ignoring false match:%s with %s\n",buffer,*info);

+					rc=0;

+				}

 			}

 		} else

 			rc = 0;

@@ -424,6 +436,7 @@ static int add_regex_list_element(struct cli_matcher* root,const char* pattern,c

        for(i=0;i<len;i++)

 	       new->pattern[i]=pattern[i];/*new->pattern is short int* */

+	

        new->virname = cli_strdup(info);

        if((ret = cli_ac_addpatt(root,new))) {

 	       free(new->virname);

@@ -545,7 +558,7 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int optio

 			fatal_error(matcher);

 			return CL_EMALFDB;

 		}

-		pattern[0]='\0';

+		/*pattern[0]='\0';*/

 		flags = buffer+1;

 		pattern++;