aboutsummaryrefslogtreecommitdiff
path: root/stdio-common/vfprintf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-11-06 21:38:49 +0000
committerUlrich Drepper <drepper@redhat.com>2007-11-06 21:38:49 +0000
commit9ca230d62f1813679700f821d3de48ce4aa73f2a (patch)
tree443df80bbebc471017f3489d131940578347ba73 /stdio-common/vfprintf.c
parenteb46bc8fd67968693f627d0a834a5aa093e931b3 (diff)
downloadglibc-9ca230d62f1813679700f821d3de48ce4aa73f2a.zip
glibc-9ca230d62f1813679700f821d3de48ce4aa73f2a.tar.gz
glibc-9ca230d62f1813679700f821d3de48ce4aa73f2a.tar.bz2
* stdio-common/vfprintf.c (vfprintf): Compute necessary buffer size
with size_t type. * stdio-common/printf_fp.c (__print_fp): Change chars_needed type to size_t. Add casts where needed.
Diffstat (limited to 'stdio-common/vfprintf.c')
-rw-r--r--stdio-common/vfprintf.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index d1dc1aa..434ad86 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -747,7 +747,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
{ \
int temp = width; \
width = prec; \
- PAD (L_('0'));; \
+ PAD (L_('0')); \
width = temp; \
} \
\
@@ -1499,18 +1499,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
if (prec > width
&& prec + 32 > (int)(sizeof (work_buffer) / sizeof (work_buffer[0])))
{
- if (__libc_use_alloca ((prec + 32) * sizeof (CHAR_T)))
- workend = ((CHAR_T *) alloca ((prec + 32) * sizeof (CHAR_T)))
- + (prec + 32);
+ if (__builtin_expect (prec > ~((size_t) 0) - 31, 0))
+ {
+ done = -1;
+ goto all_done;
+ }
+ size_t needed = ((size_t) prec + 32) * sizeof (CHAR_T);
+
+ if (__libc_use_alloca (needed))
+ workend = (((CHAR_T *) alloca (needed)) + ((size_t) prec + 32));
else
{
- workstart = (CHAR_T *) malloc ((prec + 32) * sizeof (CHAR_T));
+ workstart = (CHAR_T *) malloc (needed);
if (workstart == NULL)
{
done = -1;
goto all_done;
}
- workend = workstart + (prec + 32);
+ workend = workstart + ((size_t) prec + 32);
}
}
JUMP (*f, step2_jumps);