mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Use the correct size to allocate, copy and clear argument type tables

Browse Source 
after their change from an array of char to an array of enum.
This fixes problems that occurred when using positional arguments in
format strings, particularly with more than STATIC_ARG_TBL_SIZE (8)
of them.

PR:		65841
Submitted by:	Steven Smith (mostly)
This commit is contained in:
Tim J. Robbins 2004-04-22 11:35:12 +00:00
parent fe9892eabd
commit ccc8c6c31f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128550
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libc/stdio/vfprintf.c
View File

@ -1321,7 +1321,8 @@ __find_arguments (const char *fmt0, va_list ap, union arg **argtable)
tablesize = STATIC_ARG_TBL_SIZE;
tablemax = 0;
nextarg = 1;
memset (typetable, T_UNUSED, STATIC_ARG_TBL_SIZE);
for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
typetable[n] = T_UNUSED;
/*
* Scan the format for conversions (`%' character).
@ -1590,19 +1591,21 @@ __grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
enum typeid *const oldtable = *typetable;
const int oldsize = *tablesize;
enum typeid *newtable;
int newsize = oldsize * 2;
int n, newsize = oldsize * 2;
if (newsize < nextarg + 1)
newsize = nextarg + 1;
if (oldsize == STATIC_ARG_TBL_SIZE) {
if ((newtable = malloc(newsize)) == NULL)
if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
abort(); /* XXX handle better */
bcopy(oldtable, newtable, oldsize);
bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
} else {
if ((newtable = reallocf(oldtable, newsize)) == NULL)
newtable = reallocf(oldtable, newsize * sizeof(enum typeid));
if (newtable == NULL)
abort(); /* XXX handle better */
}
memset(&newtable[oldsize], T_UNUSED, newsize - oldsize);
for (n = oldsize; n < newsize; n++)
newtable[n] = T_UNUSED;
*typetable = newtable;
*tablesize = newsize;

15
lib/libc/stdio/vfwprintf.c
View File

@ -1317,7 +1317,8 @@ __find_arguments (const wchar_t *fmt0, va_list ap, union arg **argtable)
tablesize = STATIC_ARG_TBL_SIZE;
tablemax = 0;
nextarg = 1;
memset (typetable, T_UNUSED, STATIC_ARG_TBL_SIZE);
for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
typetable[n] = T_UNUSED;
/*
* Scan the format for conversions (`%' character).
@ -1586,19 +1587,21 @@ __grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
enum typeid *const oldtable = *typetable;
const int oldsize = *tablesize;
enum typeid *newtable;
int newsize = oldsize * 2;
int n, newsize = oldsize * 2;
if (newsize < nextarg + 1)
newsize = nextarg + 1;
if (oldsize == STATIC_ARG_TBL_SIZE) {
if ((newtable = malloc(newsize)) == NULL)
if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
abort(); /* XXX handle better */
bcopy(oldtable, newtable, oldsize);
bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
} else {
if ((newtable = reallocf(oldtable, newsize)) == NULL)
newtable = reallocf(oldtable, newsize * sizeof(enum typeid));
if (newtable == NULL)
abort(); /* XXX handle better */
}
memset(&newtable[oldsize], T_UNUSED, newsize - oldsize);
for (n = oldsize; n < newsize; n++)
newtable[n] = T_UNUSED;
*typetable = newtable;
*tablesize = newsize;