From e51d12c10630dc3c7a1b0f4c54dd0739ccbcaaa7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 24 Apr 2010 17:18:48 +0200 Subject: [PATCH] vasnprintf: Correct errno value in case of out-of-memory. --- ChangeLog | 7 +++++++ lib/vasnprintf.c | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c88ea6a77..2d4a2316f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-04-24 Bruno Haible + vasnprintf: Correct errno value in case of out-of-memory. + * lib/vasnprintf.c (VASNPRINTF): Set errno to 0 before calling SNPRINTF + or sprintf. Use the errno value from SNPRINTF or sprintf. + Reported by Ian Beckwith . + +2010-04-24 Bruno Haible + ansi-c++-opt: Find correct compiler when cross-compiling. * m4/ansi-c++.m4 (gl_PROG_ANSI_CXX): Use AC_CHECK_TOOLS instead of AC_CHECK_PROGS. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 6c11b7249..836bf10c5 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -4953,6 +4953,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } #endif + errno = 0; switch (type) { case TYPE_SCHAR: @@ -5147,15 +5148,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; } -- 2.11.0