niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

avoid unbounded strlen in gettext functions

Browse source 
use the standard strnlen idiom for cases where lengths greater than an
imposed limit are going to be rejected immediately anyway.
This commit is contained in:
Rich Felker 2017-01-29 11:24:20 -05:00
parent dbbb3734d8
commit d6601f0af0
1 changed files with 3 additions and 3 deletions

6
src/locale/dcngettext.c
View file

@ -40,8 +40,8 @@ char *bindtextdomain(const char *domainname, const char *dirname)
if (!domainname) return 0;
if (!dirname) return gettextdir(domainname, &(size_t){0});
size_t domlen = strlen(domainname);
size_t dirlen = strlen(dirname);
size_t domlen = strnlen(domainname, NAME_MAX+1);
size_t dirlen = strnlen(dirname, PATH_MAX);
if (domlen > NAME_MAX || dirlen >= PATH_MAX) {
errno = EINVAL;
return 0;
@ -127,7 +127,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2,
if (!domainname) domainname = __gettextdomain();
domlen = strlen(domainname);
domlen = strnlen(domainname, NAME_MAX+1);
if (domlen > NAME_MAX) goto notrans;
dirname = gettextdir(domainname, &dirlen);