RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-18 12:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

locale: ensure dcngettext() preserves errno

Browse Source 
Some packages call gettext to format a message to be sent to perror.
If the currently set user locale points to a non-existent .mo file,
open via __map_file in dcngettext will set errno to ENOENT.

Maintainer's notes: Non-modification of errno is a documented part of
the interface contract for the GNU version of this function and likely
other versions. The issue being fixed here seems to be a regression
from commit 1b52863e24, which enabled
setting of errno from __map_file.
This commit is contained in:
A. Wilcox 2019-01-27 21:34:57 -06:00 committed by Rich Felker
parent 1691b23955
commit 8d82971775
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/locale/dcngettext.c
View File

@ -122,6 +122,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2,
const struct __locale_map *lm;
size_t domlen;
struct binding *q;
int old_errno = errno;
if ((unsigned)category >= LC_ALL) goto notrans;
@ -138,6 +139,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2,
lm = loc->cat[category];
if (!lm) {
notrans:
errno = old_errno;
return (char *) ((n == 1) ? msgid1 : msgid2);
}
@ -250,6 +252,7 @@ notrans:
trans += l+1;
}
}
errno = old_errno;
return (char *)trans;
}