isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to round up to page size with sudo_mmap_alloc().

Browse Source
This commit is contained in:
Todd C. Miller
2023-06-29 10:17:39 -06:00
parent f437c66a2a
commit 1ba61cd13a
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/util/snprintf.c
View File

@@ -107,7 +107,7 @@ union arg {
}; };
static int __find_arguments(const char *fmt0, va_list ap, union arg **argtable); static int __find_arguments(const char *fmt0, va_list ap, union arg **argtable);
static int __grow_type_table(unsigned char **typetable, long *tablesize); static int __grow_type_table(unsigned char **typetable, int *tablesize);
static int xxxprintf(char **, size_t, int, const char *, va_list); static int xxxprintf(char **, size_t, int, const char *, va_list);
#ifdef PRINTF_WIDE_CHAR #ifdef PRINTF_WIDE_CHAR
@@ -1089,9 +1089,9 @@ __find_arguments(const char *fmt0, va_list ap, union arg **argtable)
int flags; /* flags as above */ int flags; /* flags as above */
unsigned char *typetable; /* table of types */ unsigned char *typetable; /* table of types */
unsigned char stattypetable[STATIC_ARG_TBL_SIZE]; unsigned char stattypetable[STATIC_ARG_TBL_SIZE];
long tablesize; /* current size of type table */ int tablesize; /* current size of type table */
long tablemax; /* largest used index in table */ int tablemax; /* largest used index in table */
long nextarg; /* 1-based argument index */ int nextarg; /* 1-based argument index */
int ret = 0; /* return value */ int ret = 0; /* return value */
/* /*
@@ -1421,14 +1421,10 @@ finish:
* Increase the size of the type table. * Increase the size of the type table.
*/ */
static int static int
__grow_type_table(unsigned char **typetable, long *tablesize) __grow_type_table(unsigned char **typetable, int *tablesize)
{ {
unsigned char *oldtable = *typetable; unsigned char *oldtable = *typetable;
long newsize = *tablesize * 2; int newsize = *tablesize * 2;
long size = sysconf(_SC_PAGESIZE);
if (newsize < size)
newsize = size;
if (*tablesize == STATIC_ARG_TBL_SIZE) { if (*tablesize == STATIC_ARG_TBL_SIZE) {
*typetable = sudo_mmap_alloc(newsize); *typetable = sudo_mmap_alloc(newsize);