X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fvasprintf.c;h=ba94c64ba8bc9f96a1a67f62dd9ceb8852a5d810;hb=ef0976ff2bb852d7d4016ce0b1d2afc0594ffe19;hp=bda9aa1b0f2bd812dd2477359fb08effc67dd334;hpb=e989260658cab39b391ef9dab1380024365332c8;p=gnulib.git diff --git a/lib/vasprintf.c b/lib/vasprintf.c index bda9aa1b0..ba94c64ba 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,6 @@ /* Specification. */ #include "vasprintf.h" -#include #include #include "vasnprintf.h" @@ -34,15 +33,10 @@ vasprintf (char **resultp, const char *format, va_list args) char *result = vasnprintf (NULL, &length, format, args); if (result == NULL) return -1; - if (length > INT_MAX) - { - /* We could produce such a big string, but can't return its length - as an 'int'. */ - free (result); - return -1; - } *resultp = result; - /* Return the number of resulting bytes, excluding the trailing NUL. */ + /* Return the number of resulting bytes, excluding the trailing NUL. + If it wouldn't fit in an 'int', vasnprintf() would have returned NULL + and set errno to EOVERFLOW. */ return length; }