d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locale: fix buffer management

Browse Source 
Also, handle signed and unsigned chars, and more gracefully handle
invalid input.

Submitted by:	bde in response to r309331
MFC after:	1 week
Sponsored by:	Dell EMC
This commit is contained in:
Eric van Gyzen 2016-12-01 16:54:02 +00:00
parent 007dbc1f18
commit 71500aab3e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.bin/locale/locale.c
View File

@ -495,29 +495,29 @@ format_grouping(const char *binary)
{
static char rval[64];
const char *cp;
size_t len;
size_t roff;
int len;
rval[0] = '\0';
roff = 0;
for (cp = binary; *cp != '\0'; ++cp) {
char group[sizeof("127;")];
snprintf(group, sizeof(group), "%hhd;", *cp);
len = strlcat(rval, group, sizeof(rval));
if (len >= sizeof(rval)) {
len = sizeof(rval) - 1;
break;
}
if (*cp == CHAR_MAX) {
break;
}
if (*cp < 0)
break; /* garbage input */
len = snprintf(&rval[roff], sizeof(rval) - roff, "%u;", *cp);
if (len < 0 || (unsigned)len >= sizeof(rval) - roff)
break; /* insufficient space for output */
roff += len;
if (*cp == CHAR_MAX)
break; /* special termination */
}
/* Remove the trailing ';'. */
rval[len - 1] = '\0';
/* Truncate at the last successfully snprintf()ed semicolon. */
if (roff != 0)
rval[roff - 1] = '\0';
return (rval);
return (&rval[0]);
}
/*
* keyword value lookup helper (via localeconv())
*/