vasnprintf: Correct errno value in case of out-of-memory.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 985a7e5f2894e6abf0828ad5ba0e327fa7396d1a..cdf1bc3d681e58204365d1c909b170eaf6542698 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-24  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Correct errno value in case of out-of-memory.
+       * vasnprintf.c (VASNPRINTF): Set errno to 0 before calling SNPRINTF or
+       sprintf. Use the errno value from SNPRINTF or sprintf.
+       Reported by Ian Beckwith <ianb@erislabs.net>.
+
 2010-04-10  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Correct handling of unconvertible wide string arguments.

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index b4331ea2dd194cf2ec877fa916c432dee4c78284..82d4b94c88106401489fc218a8c454e1cbf0585f 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -4954,6 +4954,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 #endif
 
+                    errno = 0;
                     switch (type)
                       {
                       case TYPE_SCHAR:
@@ -5148,15 +5149,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* Attempt to handle failure.  */
                     if (count < 0)
                       {
+                        /* SNPRINTF or sprintf failed.  Save and use the errno
+                           that it has set, if any.  */
+                        int saved_errno = errno;
+
                         if (!(result == resultbuf || result == NULL))
                           free (result);
                         if (buf_malloced != NULL)
                           free (buf_malloced);
                         CLEANUP ();
                         errno =
-                          (dp->conversion == 'c' || dp->conversion == 's'
-                           ? EILSEQ
-                           : EINVAL);
+                          (saved_errno != 0
+                           ? saved_errno
+                           : (dp->conversion == 'c' || dp->conversion == 's'
+                              ? EILSEQ
+                              : EINVAL));
                         return NULL;
                       }
 

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index f7ea8602cb778f201a87ef98ecf7733c4d79cff0..56172691605d780d52a4f77b74581b65a9ba289d 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-24  Bruno Haible  <bruno@clisp.org>
+
+       vasnprintf: Correct errno value in case of out-of-memory.
+       * vasnprintf.c (VASNPRINTF): Set errno to 0 before calling SNPRINTF or
+       sprintf. Use the errno value from SNPRINTF or sprintf.
+       Reported by Ian Beckwith <ianb@erislabs.net>.
+
 2010-04-10  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Correct handling of unconvertible wide string arguments.

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index b4331ea2dd194cf2ec877fa916c432dee4c78284..82d4b94c88106401489fc218a8c454e1cbf0585f 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -4954,6 +4954,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 #endif
 
+                    errno = 0;
                     switch (type)
                       {
                       case TYPE_SCHAR:
@@ -5148,15 +5149,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* Attempt to handle failure.  */
                     if (count < 0)
                       {
+                        /* SNPRINTF or sprintf failed.  Save and use the errno
+                           that it has set, if any.  */
+                        int saved_errno = errno;
+
                         if (!(result == resultbuf || result == NULL))
                           free (result);
                         if (buf_malloced != NULL)
                           free (buf_malloced);
                         CLEANUP ();
                         errno =
-                          (dp->conversion == 'c' || dp->conversion == 's'
-                           ? EILSEQ
-                           : EINVAL);
+                          (saved_errno != 0
+                           ? saved_errno
+                           : (dp->conversion == 'c' || dp->conversion == 's'
+                              ? EILSEQ
+                              : EINVAL));
                         return NULL;
                       }