@@ -1,3 +1,10 @@

+Sun Nov  5 19:11:28 CET 2006 (acab)

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

+  * libclamav/regex_list.c: apply patch from Edvin to:

+                            fix jump on uninitialized variable

+                            fix improprer string length calculation

+			    - closes bug 52 -

+

 Sun Nov  5 15:08:09 CET 2006 (tk)

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

   * libclamav/pe.c: don't report I/O error when EP is near (less than 200 bytes)

@@ -19,6 +19,9 @@

  *  MA 02110-1301, USA.

  *

  *  $Log: regex_list.c,v $

+ *  Revision 1.14  2006/11/05 18:16:56  acab

+ *  Patch for bug 52 from Edvin

+ *

  *  Revision 1.13  2006/10/30 17:53:03  tkojm

  *  apply patch from Edvin reported by Luca

  *

@@ -344,10 +347,10 @@ int regex_list_match(struct regex_matcher* matcher,const char* real_url,const ch

 	{

 		size_t real_len    = strlen(real_url);

 		size_t display_len = strlen(display_url);

-		size_t buffer_len  = hostOnly ? real_len : real_len + display_len + 1;

+		size_t buffer_len  = (hostOnly && !is_whitelist) ? real_len : real_len + display_len + 1;

 		char*  buffer = cli_malloc(buffer_len+1);

 		size_t i;

-		int partcnt,rc;

+		int partcnt,rc = 0;

 		unsigned long int partoff;

 		if(!buffer)