Mercurial > hg > octave-nkf > gnulib-hg
changeset 4833:d12cca839b2d
Check for overflow when converting from size_t to 'int'.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 30 Oct 2003 14:09:04 +0000 |
| parents | 82b23fb351ab |
| children | 6310eac53465 |
| files | lib/ChangeLog lib/vasprintf.c |
| diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2003-10-30 Paul Eggert <eggert@twinsun.com> + Bruno Haible <bruno@clisp.org> + + * vasprintf.c: Include <limits.h>, <stdlib.h>. + (vasprintf): Fail if the resulting length doesn't fit in an 'int'. + 2003-10-29 Paul Eggert <eggert@twinsun.com> * xalloc.h (xalloc_oversized): Now a macro, not a function,
--- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* 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 @@ -22,6 +22,9 @@ /* Specification. */ #include "vasprintf.h" +#include <limits.h> +#include <stdlib.h> + #include "vasnprintf.h" int @@ -31,6 +34,14 @@ 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;