Ensure errno when strdup fails.

diff --git a/ChangeLog b/ChangeLog
index 856cdf8..8996bd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-01-21  Bruno Haible  <bruno@clisp.org>
 
+       * lib/striconv.c (str_iconv): Guarantee errno is set when strdup fails.
+       * lib/striconveh.c (str_iconveh): Likewise.
+
+2007-01-21  Bruno Haible  <bruno@clisp.org>
+
        * lib/striconveh.h (mem_iconveh): New declaration.
        * lib/striconveh.c (mem_iconveh): New function.
        * tests/test-striconveh.c (main): Add tests for mem_iconveh.

diff --git a/lib/striconv.c b/lib/striconv.c
index b2490a7..7c4f549 100644 (file)
--- a/lib/striconv.c
+++ b/lib/striconv.c
@@ -398,7 +398,13 @@ char *
 str_iconv (const char *src, const char *from_codeset, const char *to_codeset)
 {
   if (c_strcasecmp (from_codeset, to_codeset) == 0)
-    return strdup (src);
+    {
+      char *result = strdup (src);
+
+      if (result == NULL)
+       errno = ENOMEM;
+      return result;
+    }
   else
     {
 #if HAVE_ICONV

diff --git a/lib/striconveh.c b/lib/striconveh.c
index c27ef98..235e606 100644 (file)
--- a/lib/striconveh.c
+++ b/lib/striconveh.c
@@ -920,7 +920,13 @@ str_iconveh (const char *src,
             enum iconv_ilseq_handler handler)
 {
   if (c_strcasecmp (from_codeset, to_codeset) == 0)
-    return strdup (src);
+    {
+      char *result = strdup (src);
+
+      if (result == NULL)
+       errno = ENOMEM;
+      return result;
+    }
   else
     {
 #if HAVE_ICONV