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

Tighten up vfprintf width, precision, and total length overflow handling.

Browse Source 
With help from Paul Eggert, Carlos O'Donell, and Roland McGrath.
	* stdio-common/printf-parse.h (read_int): Change return type to
	'int', return -1 on INT_MAX overflow.
	* stdio-common/vfprintf.c (vfprintf): Validate width and precision
	against overflow of INT_MAX.  Set errno to EOVERFLOW when 'done'
	overflows INT_MAX.  Check for overflow of in-format-string precision
	values properly.  Use EOVERFLOW rather than ERANGE throughout.  Use
	SIZE_MAX not INT_MAX for integer overflow test.
	* stdio-common/printf-parsemb.c: If read_int signals an overflow,
	skip the construct in the format string but do not record anything.
	* stdio-common/bug22.c: Adjust to test both width/prevision
	INT_MAX overflow as well as total length INT_MAX overflow.  Check
	explicitly for proper errno values.
This commit is contained in:
David S. Miller
2012-04-02 14:31:19 -07:00
parent 302cadd343
commit 135ffda8b8
5 changed files with 147 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
stdio-common/bug22.c
View File

@@ -1,12 +1,22 @@
/* BZ #5424 */
#include <stdio.h>
#include <errno.h>
/* INT_MAX + 1 */
#define N 2147483648
/* (INT_MAX / 2) + 2 */
#define N2 1073741825
/* INT_MAX - 3 */
#define N3 2147483644
#define STRINGIFY(S) #S
#define MAKE_STR(S) STRINGIFY(S)
#define SN MAKE_STR(N)
#define SN2 MAKE_STR(N2)
#define SN3 MAKE_STR(N3)
static int
do_test (void)
@@ -20,11 +30,25 @@ do_test (void)
return 1;
}
ret = fprintf (fp, "%" SN "d%" SN "d", 1, 1);
ret = fprintf (fp, "%" SN "d", 1);
printf ("ret = %d\n", ret);
if (ret != -1 || errno != EOVERFLOW)
return 1;
ret = fprintf (fp, "%." SN "d", 1);
printf ("ret = %d\n", ret);
if (ret != -1 || errno != EOVERFLOW)
return 1;
ret = fprintf (fp, "%." SN3 "d", 1);
printf ("ret = %d\n", ret);
if (ret != -1 || errno != EOVERFLOW)
return 1;
ret = fprintf (fp, "%" SN2 "d%" SN2 "d", 1, 1);
printf ("ret = %d\n", ret);
return ret != -1;
return ret != -1 || errno != EOVERFLOW;
}
#define TIMEOUT 30