diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2004-10-04 04:09:41 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-10-04 04:09:41 +0000 |
commit | 55fbe6686af907ac025888e290c5b8ef879b5879 (patch) | |
tree | 32340229b3778f12901c6b9dd99401212a8d2f23 /lib/vasprintf.c | |
parent | 14f5062c301fcfb23fb265b9352cc2aa952036c9 (diff) | |
download | coreutils-55fbe6686af907ac025888e290c5b8ef879b5879.tar.xz |
Sync from gnulib.
Diffstat (limited to 'lib/vasprintf.c')
-rw-r--r-- | lib/vasprintf.c | 14 |
1 files changed, 4 insertions, 10 deletions
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 <limits.h> #include <stdlib.h> #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; } |