X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Funiconv%2Fu8-conv-to-enc.c;h=cd1145d1f8fb8c95ef72ff8df9899387155ff7a5;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=bc2cc09c93556f12d5dcffa8538ae13216ae80b5;hpb=ac5cf7982cea8a4bb17680b6b9925f301cfa4220;p=gnulib.git

diff --git a/lib/uniconv/u8-conv-to-enc.c b/lib/uniconv/u8-conv-to-enc.c
index bc2cc09c9..cd1145d1f 100644
--- a/lib/uniconv/u8-conv-to-enc.c
+++ b/lib/uniconv/u8-conv-to-enc.c
@@ -1,5 +1,5 @@
 /* Conversion from UTF-8 to legacy encodings.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -29,47 +29,64 @@
 #include "striconveha.h"
 #include "unistr.h"
 
-int
+char *
 u8_conv_to_encoding (const char *tocode,
-		     enum iconv_ilseq_handler handler,
-		     const uint8_t *src, size_t srclen,
-		     size_t *offsets,
-		     char **resultp, size_t *lengthp)
+                     enum iconv_ilseq_handler handler,
+                     const uint8_t *src, size_t srclen,
+                     size_t *offsets,
+                     char *resultbuf, size_t *lengthp)
 {
-  char *result;
-
   if (STRCASEEQ (tocode, "UTF-8", 'U','T','F','-','8',0,0,0,0))
     {
+      char *result;
+
       /* Conversion from UTF-8 to UTF-8.  No need to go through iconv().  */
 #if CONFIG_UNICODE_SAFETY
       if (u8_check (src, srclen))
-	{
-	  errno = EILSEQ;
-	  return -1;
-	}
+        {
+          errno = EILSEQ;
+          return NULL;
+        }
 #endif
 
       /* Memory allocation.  */
-      if (*resultp != NULL && *lengthp >= srclen)
-	result = *resultp;
+      if (resultbuf != NULL && *lengthp >= srclen)
+        result = resultbuf;
       else
-	{
-	  result = (char *) malloc (srclen);
-	  if (result == NULL)
-	    {
-	      errno = ENOMEM;
-	      return -1;
-	    }
-	}
+        {
+          result = (char *) malloc (srclen > 0 ? srclen : 1);
+          if (result == NULL)
+            {
+              errno = ENOMEM;
+              return NULL;
+            }
+        }
 
       memcpy (result, (const char *) src, srclen);
-      *resultp = result;
       *lengthp = srclen;
-      return 0;
+      return result;
     }
   else
-    return mem_iconveha ((const char *) src, srclen,
-			 "UTF-8", tocode,
-			 handler == iconveh_question_mark, handler,
-			 offsets, resultp, lengthp);
+    {
+      char *result = resultbuf;
+      size_t length = *lengthp;
+
+      if (mem_iconveha ((const char *) src, srclen,
+                        "UTF-8", tocode,
+                        handler == iconveh_question_mark, handler,
+                        offsets, &result, &length) < 0)
+        return NULL;
+
+      if (result == NULL) /* when (resultbuf == NULL && length == 0)  */
+        {
+          result = (char *) malloc (1);
+          if (result == NULL)
+            {
+              errno = ENOMEM;
+              return NULL;
+            }
+        }
+      *lengthp = length;
+      return result;
+    }
 }