projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo "it it" in changelog entry.
[gnulib.git]
/
lib
/
vasprintf.c
diff --git
a/lib/vasprintf.c
b/lib/vasprintf.c
index
7c8f212
..
bda9aa1
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
-2003
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
@@
-22,6
+22,9
@@
/* Specification. */
#include "vasprintf.h"
/* Specification. */
#include "vasprintf.h"
+#include <limits.h>
+#include <stdlib.h>
+
#include "vasnprintf.h"
int
#include "vasnprintf.h"
int
@@
-31,6
+34,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)
+ {
+ /* 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 length;
*resultp = result;
/* Return the number of resulting bytes, excluding the trailing NUL. */
return length;