@@ -785,6 +785,25 @@ char *cli_mpool_strdup(mpool_t *mp, const char *s) {

   return alloc;

 }

+char *cli_mpool_strndup(mpool_t *mp, const char *s, size_t n) {

+  char *alloc;

+  size_t strsz;

+

+  if(s == NULL) {

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

+    return NULL;

+  }

+

+  strsz = strnlen(s, n) + 1;

+  alloc = mpool_malloc(mp, strsz);

+  if(!alloc)

+    cli_errmsg("cli_mpool_strndup(): Can't allocate memory (%lu bytes).\n", (unsigned long) strsz);

+  else

+    memcpy(alloc, s, strsz-1);

+  alloc[strsz-1] = '\0';

+  return alloc;

+}

+

 /* #define EXPAND_PUA */

 char *cli_mpool_virname(mpool_t *mp, const char *virname, unsigned int official) {

   char *newname, *pt;

@@ -36,6 +36,7 @@ void *mpool_realloc(mpool_t *mpool, void *ptr, size_t size);

 void *mpool_realloc2(mpool_t *mpool, void *ptr, size_t size);

 unsigned char *cli_mpool_hex2str(mpool_t* mpool, const char *src);

 char *cli_mpool_strdup(mpool_t *mpool, const char *s);

+char *cli_mpool_strndup(mpool_t *mpool, const char *s, size_t n);

 char *cli_mpool_virname(mpool_t *mpool, const char *virname, unsigned int official);

 uint16_t *cli_mpool_hex2ui(mpool_t *mpool, const char *hex);

 void mpool_flush(mpool_t *mpool);

@@ -50,6 +51,7 @@ typedef void mpool_t;

 #define mpool_realloc2(a, b, c) cli_realloc2(b, c)

 #define cli_mpool_hex2str(mpool, src) cli_hex2str(src)

 #define cli_mpool_strdup(mpool, s) cli_strdup(s)

+#define cli_mpool_strndup(mpool, s, n) cli_strdup(s, n)

 #define cli_mpool_virname(mpool, a, b) cli_virname(a, b)

 #define cli_mpool_hex2ui(mpool, hex) cli_hex2ui(hex)

 #define mpool_flush(val)

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

+char *cli_strndup(const char *s, size_t n);

 int cli_rmdirs(const char *dirname);

 char *cli_hashstream(FILE *fs, unsigned char *digcpy, int type);

 char *cli_hashfile(const char *filename, int type);

@@ -284,6 +284,30 @@ char *cli_strdup(const char *s)

     return alloc;

 }

+char *cli_strndup(const char *s, size_t n)

+{

+        char *alloc;

+        size_t len;

+

+    if(s == NULL) {

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

+        return NULL;

+    }

+

+    len = strnlen(s, n);

+    alloc = malloc(len+1);

+

+    if(!alloc) {

+        perror("strndup_problem");

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

+        return NULL;

+    } else

+        memcpy(alloc, s, len);

+

+    alloc[len] = '\0';

+    return alloc;

+}

+

 /* returns converted timestamp, in case of error the returned string contains at least one character */

 const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

 {

@@ -2307,7 +2307,7 @@ static inline int hash_impfns(cli_ctx *ctx, void **hashctx, uint32_t *impsz, str

                 if (offset >= 0) {

                     /* Hint field is a uint16_t and precedes the Name field */

                     if ((buffer = fmap_need_off_once(map, offset+sizeof(uint16_t), MIN(PE_MAXNAMESIZE, fsize-offset))) != NULL) {

-                        funcname = strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

+                        funcname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

                         if (funcname == NULL) {

                             cli_dbgmsg("scan_pe: cannot duplicate function name\n");

                             return CL_EMEM;

@@ -2343,7 +2343,7 @@ static inline int hash_impfns(cli_ctx *ctx, void **hashctx, uint32_t *impsz, str

                 if (offset >= 0) {

                     /* Hint field is a uint16_t and precedes the Name field */

                     if ((buffer = fmap_need_off_once(map, offset+sizeof(uint16_t), MIN(PE_MAXNAMESIZE, fsize-offset))) != NULL) {

-                        funcname = strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

+                        funcname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

                         if (funcname == NULL) {

                             cli_dbgmsg("scan_pe: cannot duplicate function name\n");

                             return CL_EMEM;

@@ -2462,7 +2462,7 @@ static unsigned int hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *

             goto hash_imptbl_end;

         }

-        dllname = strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

+        dllname = cli_strndup(buffer, MIN(PE_MAXNAMESIZE, fsize-offset));

         if (dllname == NULL) {

             cli_dbgmsg("scan_pe: cannot duplicate dll name\n");

             ret = CL_EMEM;