lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

* stdio-common/vfprintf.c (vfprintf): Compute necessary buffer size

Browse Source 
with size_t type.
	* stdio-common/printf_fp.c (__print_fp): Change chars_needed type to
	size_t.  Add casts where needed.
This commit is contained in:
Ulrich Drepper
2007-11-06 21:38:49 +00:00
parent eb46bc8fd6
commit 9ca230d62f
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stdio-common/vfprintf.c
View File

@@ -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);