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

+Wed Nov  1 19:15:57 CET 2006 (tk)

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

+  * libclamav/others.c: add cli_strdup(), thanks to NJH

+

 Wed Nov  1 18:59:48 CET 2006 (tk)

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

   * libclamav: add support for self-extracting MS Cabinet archives

@@ -385,12 +385,37 @@ void *cli_realloc(void *ptr, size_t size)

     alloc = realloc(ptr, size);

     if(!alloc) {

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

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

 	perror("realloc_problem");

 	return NULL;

     } else return alloc;

 }

+char *cli_strdup(const char *s)

+{

+        char *alloc;

+

+

+    if(s == NULL) {

+        cli_errmsg("cli_strdup(): s == NULL. Please report to http://bugs.clamav.net\n");

+        return NULL;

+    }

+

+#if defined(_MSC_VER) && defined(_DEBUG)

+    alloc = _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__);

+#else

+    alloc = strdup(s);

+#endif

+

+    if(!alloc) {

+        cli_errmsg("cli_strdup(): Can't allocate memory (%u bytes).\n", strlen(s));

+        perror("strdup_problem");

+        return NULL;

+    }

+

+    return alloc;

+}

+

 unsigned int cli_rndnum(unsigned int max)

 {

     struct timeval tv;

@@ -130,6 +130,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);

+char *cli_strdup(const char *s);

 int cli_rmdirs(const char *dirname);

 unsigned char *cli_md5digest(int desc);

 char *cli_md5stream(FILE *fs, unsigned char *digcpy);