projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SCNX* macros don't exist.
[gnulib.git]
/
lib
/
vasprintf.c
diff --git
a/lib/vasprintf.c
b/lib/vasprintf.c
index
7c8f212
..
91da881
100644
(file)
--- a/
lib/vasprintf.c
+++ b/
lib/vasprintf.c
@@
-1,5
+1,5
@@
/* Formatted output to strings.
/* Formatted output to strings.
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002
, 2006
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
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
@@
-13,7
+13,7
@@
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
@@
-22,8
+22,17
@@
/* Specification. */
#include "vasprintf.h"
/* Specification. */
#include "vasprintf.h"
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
#include "vasnprintf.h"
#include "vasnprintf.h"
+/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
+#ifndef EOVERFLOW
+# define EOVERFLOW E2BIG
+#endif
+
int
vasprintf (char **resultp, const char *format, va_list args)
{
int
vasprintf (char **resultp, const char *format, va_list args)
{
@@
-31,6
+40,14
@@
vasprintf (char **resultp, const char *format, va_list args)
char *result = vasnprintf (NULL, &length, format, args);
if (result == NULL)
return -1;
char *result = vasnprintf (NULL, &length, format, args);
if (result == NULL)
return -1;
+
+ if (length > INT_MAX)
+ {
+ free (result);
+ errno = EOVERFLOW;
+ return -1;
+ }
+
*resultp = result;
/* Return the number of resulting bytes, excluding the trailing NUL. */
return length;
*resultp = result;
/* Return the number of resulting bytes, excluding the trailing NUL. */
return length;