AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2007-11-06 Ulrich Drepper <drepper@redhat.com> 2007-11-06 Ulrich Drepper <drepper@redhat.com>
* 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.
* nscd/selinux.c (nscd_request_avc_has_perm): When compiled with * nscd/selinux.c (nscd_request_avc_has_perm): When compiled with
old headers, don't call avc_has_perm if we don't have the old headers, don't call avc_has_perm if we don't have the
permission information. permission information.

17
stdio-common/printf_fp.c
View File

@ -808,7 +808,7 @@ ___printf_fp (FILE *fp,
{ {
int width = info->width; int width = info->width;
wchar_t *wstartp, *wcp; wchar_t *wstartp, *wcp;
int chars_needed; size_t chars_needed;
int expscale; int expscale;
int intdig_max, intdig_no = 0; int intdig_max, intdig_no = 0;
int fracdig_min; int fracdig_min;
@ -823,7 +823,7 @@ ___printf_fp (FILE *fp,
type = info->spec; type = info->spec;
intdig_max = 1; intdig_max = 1;
fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec; fracdig_min = fracdig_max = info->prec < 0 ? 6 : info->prec;
chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4; chars_needed = 1 + 1 + (size_t) fracdig_max + 1 + 1 + 4;
/* d . ddd e +- ddd */ /* d . ddd e +- ddd */
dig_max = INT_MAX; /* Unlimited. */ dig_max = INT_MAX; /* Unlimited. */
significant = 1; /* Does not matter here. */ significant = 1; /* Does not matter here. */
@ -838,12 +838,12 @@ ___printf_fp (FILE *fp,
{ {
intdig_max = exponent + 1; intdig_max = exponent + 1;
/* This can be really big! */ /* XXX Maybe malloc if too big? */ /* This can be really big! */ /* XXX Maybe malloc if too big? */
chars_needed = exponent + 1 + 1 + fracdig_max; chars_needed = (size_t) exponent + 1 + 1 + (size_t) fracdig_max;
} }
else else
{ {
intdig_max = 1; intdig_max = 1;
chars_needed = 1 + 1 + fracdig_max; chars_needed = 1 + 1 + (size_t) fracdig_max;
} }
} }
else else
@ -858,7 +858,7 @@ ___printf_fp (FILE *fp,
type = isupper (info->spec) ? 'E' : 'e'; type = isupper (info->spec) ? 'E' : 'e';
fracdig_max = dig_max - 1; fracdig_max = dig_max - 1;
intdig_max = 1; intdig_max = 1;
chars_needed = 1 + 1 + fracdig_max + 1 + 1 + 4; chars_needed = 1 + 1 + (size_t) fracdig_max + 1 + 1 + 4;
} }
else else
{ {
@ -870,7 +870,7 @@ ___printf_fp (FILE *fp,
zeros can be as many as would be required for zeros can be as many as would be required for
exponential notation with a negative two-digit exponential notation with a negative two-digit
exponent, which is 4. */ exponent, which is 4. */
chars_needed = dig_max + 1 + 4; chars_needed = (size_t) dig_max + 1 + 4;
} }
fracdig_min = info->alt ? fracdig_max : 0; fracdig_min = info->alt ? fracdig_max : 0;
significant = 0; /* We count significant digits. */ significant = 0; /* We count significant digits. */
@ -888,16 +888,17 @@ ___printf_fp (FILE *fp,
it is possible that we need two more characters in front of all the it is possible that we need two more characters in front of all the
other output. If the amount of memory we have to allocate is too other output. If the amount of memory we have to allocate is too
large use `malloc' instead of `alloca'. */ large use `malloc' instead of `alloca'. */
size_t wbuffer_to_alloc = (2 + (size_t) chars_needed) * sizeof (wchar_t);
buffer_malloced = ! __libc_use_alloca (chars_needed * 2 * sizeof (wchar_t)); buffer_malloced = ! __libc_use_alloca (chars_needed * 2 * sizeof (wchar_t));
if (__builtin_expect (buffer_malloced, 0)) if (__builtin_expect (buffer_malloced, 0))
{ {
wbuffer = (wchar_t *) malloc ((2 + chars_needed) * sizeof (wchar_t)); wbuffer = (wchar_t *) malloc (wbuffer_to_alloc);
if (wbuffer == NULL) if (wbuffer == NULL)
/* Signal an error to the caller. */ /* Signal an error to the caller. */
return -1; return -1;
} }
else else
wbuffer = (wchar_t *) alloca ((2 + chars_needed) * sizeof (wchar_t)); wbuffer = (wchar_t *) alloca (wbuffer_to_alloc);
wcp = wstartp = wbuffer + 2; /* Let room for rounding. */ wcp = wstartp = wbuffer + 2; /* Let room for rounding. */
/* Do the real work: put digits in allocated buffer. */ /* Do the real work: put digits in allocated buffer. */

18
stdio-common/vfprintf.c
View File

@ -747,7 +747,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
{ \ { \
int temp = width; \ int temp = width; \
width = prec; \ width = prec; \
PAD (L_('0'));; \ PAD (L_('0')); \
width = temp; \ width = temp; \
} \ } \
\ \
@ -1499,18 +1499,24 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
if (prec > width if (prec > width
&& prec + 32 > (int)(sizeof (work_buffer) / sizeof (work_buffer[0]))) && prec + 32 > (int)(sizeof (work_buffer) / sizeof (work_buffer[0])))
{ {
if (__libc_use_alloca ((prec + 32) * sizeof (CHAR_T))) if (__builtin_expect (prec > ~((size_t) 0) - 31, 0))
workend = ((CHAR_T *) alloca ((prec + 32) * sizeof (CHAR_T))) {
+ (prec + 32); 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 else
{ {
workstart = (CHAR_T *) malloc ((prec + 32) * sizeof (CHAR_T)); workstart = (CHAR_T *) malloc (needed);
if (workstart == NULL) if (workstart == NULL)
{ {
done = -1; done = -1;
goto all_done; goto all_done;
} }
workend = workstart + (prec + 32); workend = workstart + ((size_t) prec + 32);
} }
} }
JUMP (*f, step2_jumps); JUMP (*f, step2_jumps);