@@ -1,3 +1,7 @@

+Fri May 25 21:39:53 CEST 2007 (tk)

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

+  * libclamav/others.[ch]: add cli_realloc2()

+

 Fri May 25 10:33:19 BST 2007 (njh)

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

   * libclamav/blob.c:	Bug 520

@@ -379,6 +379,27 @@ void *cli_realloc(void *ptr, size_t size)

     } else return alloc;

 }

+void *cli_realloc2(void *ptr, size_t size)

+{

+	void *alloc;

+

+

+    if(!size || size > CLI_MAX_ALLOCATION) {

+	cli_errmsg("cli_realloc2(): Attempt to allocate %u bytes. Please report to http://bugs.clamav.net\n", size);

+	return NULL;

+    }

+

+    alloc = realloc(ptr, size);

+

+    if(!alloc) {

+	cli_errmsg("cli_realloc2(): Can't re-allocate memory to %u bytes.\n", size);

+	perror("realloc_problem");

+	if(ptr)

+	    free(ptr);

+	return NULL;

+    } else return alloc;

+}

+

 char *cli_strdup(const char *s)

 {

         char *alloc;

@@ -173,6 +173,7 @@ void cli_dbgmsg(const char *str, ...);

 void *cli_malloc(size_t nmemb);

 void *cli_calloc(size_t nmemb, size_t size);

 void *cli_realloc(void *ptr, size_t size);

+void *cli_realloc2(void *ptr, size_t size);

 char *cli_strdup(const char *s);

 int cli_rmdirs(const char *dirname);

 unsigned char *cli_md5digest(int desc);