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

Prevent out of bounds writting for too many slashes case.

Browse Source 
Replace strnpy + ='\0' with strlcpy

MFC after:	1 day
This commit is contained in:
Andrey A. Chernov 2002-08-02 01:04:49 +00:00
parent 844a8917d6
commit ef1e7a2656
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libc/locale/setlocale.c
View File

@ -129,33 +129,29 @@ setlocale(category, locale)
if (!env || !*env || strchr(env, '/'))
env = "C";
(void) strncpy(new_categories[category], env, ENCODING_LEN);
new_categories[category][ENCODING_LEN] = '\0';
(void)strlcpy(new_categories[category], env, ENCODING_LEN + 1);
if (category == LC_ALL) {
for (i = 1; i < _LC_LAST; ++i) {
if (!(env = getenv(categories[i])) || !*env)
env = new_categories[LC_ALL];
(void)strncpy(new_categories[i], env, ENCODING_LEN);
new_categories[i][ENCODING_LEN] = '\0';
(void)strlcpy(new_categories[i], env, ENCODING_LEN + 1);
}
}
} else if (category != LC_ALL) {
(void)strncpy(new_categories[category], locale, ENCODING_LEN);
new_categories[category][ENCODING_LEN] = '\0';
} else {
} else if (category != LC_ALL)
(void)strlcpy(new_categories[category], locale, ENCODING_LEN + 1);
else {
if ((r = strchr(locale, '/')) == NULL) {
for (i = 1; i < _LC_LAST; ++i) {
(void)strncpy(new_categories[i], locale, ENCODING_LEN);
new_categories[i][ENCODING_LEN] = '\0';
}
for (i = 1; i < _LC_LAST; ++i)
(void)strlcpy(new_categories[i], locale, ENCODING_LEN + 1);
} else {
for (i = 1; r[1] == '/'; ++r);
if (!r[1])
return (NULL); /* Hmm, just slashes... */
do {
if (i == _LC_LAST)
return(NULL); /* Too many slashes... */
len = r - locale > ENCODING_LEN ? ENCODING_LEN : r - locale;
(void)strncpy(new_categories[i], locale, len);
new_categories[i][len] = '\0';
(void)strlcpy(new_categories[i], locale, len + 1);
i++;
locale = r;
while (*locale == '/')