X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstriconveh.c;h=9467e4dbd778b525f7dbd925335c6f2221a696c8;hb=8099cad631717c6f59d3b1e149971e243eee796e;hp=e448a994d6063acf7ef1b1ebe04cd908feb4586b;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/lib/striconveh.c b/lib/striconveh.c
index e448a994d..9467e4dbd 100644
--- a/lib/striconveh.c
+++ b/lib/striconveh.c
@@ -970,18 +970,27 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
   if (result == tmpbuf)
     {
       size_t memsize = length + extra_alloc;
-      char *memory;
 
-      memory = (char *) malloc (memsize > 0 ? memsize : 1);
-      if (memory != NULL)
+      if (*resultp != NULL && *lengthp >= memsize)
         {
-          memcpy (memory, tmpbuf, length);
-          result = memory;
+          result = *resultp;
+          memcpy (result, tmpbuf, length);
         }
       else
         {
-          errno = ENOMEM;
-          return -1;
+          char *memory;
+
+          memory = (char *) malloc (memsize > 0 ? memsize : 1);
+          if (memory != NULL)
+            {
+              memcpy (memory, tmpbuf, length);
+              result = memory;
+            }
+          else
+            {
+              errno = ENOMEM;
+              return -1;
+            }
         }
     }
   else if (result != *resultp && length + extra_alloc < allocated)