@@ -46,6 +46,7 @@ Robbert Kouprie <robbert*exx.nl>

 Thomas Lamy <Thomas.Lamy*in-online.net>

 Peter N Lewis <peter*stairways.com.au>

 David S. Madole <david*madole.net>

+Denis De Messemacker <ddm*clamav.net>

 Mark Mielke <mark*mark.mielke.cc>

 Arkadiusz Miskiewicz <misiek*pld.org.pl>

 Hendrik Muhs <Hendrik.Muhs*student.uni-magdeburg.de>

@@ -1,3 +1,9 @@

+Fri Dec 12 21:07:49 CET 2003 (tk)

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

+  * libclamav: new cl_chomp() from Nigel

+  * clamscan: fixed a buffer overflow in --move (patch by Denis De Messemacker

+	      <ddm*clamav.net>)

+

 Fri Dec 12 18:47:10 CET 2003 (tk)

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

   * clamd: clamuko - fixed a segmentation fault after database update. Problem

@@ -921,7 +921,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

         return;

     }

-    if(!(movefilename = malloc(sizeof(char) * (strlen(movedir) + strlen(tmp)))))

+    if(!(movefilename = malloc(sizeof(char) * (strlen(movedir) + strlen(tmp) + 1))))

     {

         mprintf("@error moving file '%s'.\n", filename);

         mprintf("clamscan: malloc() returned NULL.\n");

@@ -118,16 +118,25 @@ int cli_strbcasestr(const char *haystack, const char *needle)

 void cli_chomp(char *string)

 {

-	int l = strlen(string);

+	size_t l = strlen(string);

-    if(string[l - 1] == 10 || string[l - 1] == 13)

-	string[l - 1] = 0;

-    l = strlen(string);

-    if(string[l - 1] == '\r')

-	string[l - 1] = 0;

+    if(l == 0)

+	return;

+

+    --l;

+    if((string[l] == '\n') || (string[l] == '\r')) {

+	string[l] = '\0';

+

+	if(l > 0) {

+	    --l;

+	    if(string[l] == '\r')

+		string[l] = '\0';

+	}

+    }

 }

+

 /*

  * char *cli_strok(const char *line, int fieldno, char *delim)

  * Return a copy of field <fieldno> from the string <line>, where