[PATCH] locale: ensure dcngettext() preserves errno

[PATCH] locale: ensure dcngettext() preserves errno

[A. Wilcox]

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

Simple test case is to compile coreutils with NLS enabled and then run
`ls /root` as an unprivileged user.

Before this commit:
ls: cannot open directory '/root': No such file or directory

After this commit:
ls: cannot open directory '/root': Permission denied

Originally reported by aranea on #Adelie.
---
 src/locale/dcngettext.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c
index 8b891d00..4c304393 100644
--- a/src/locale/dcngettext.c
+++ b/src/locale/dcngettext.c
@@ -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;
 }
 
-- 
2.19.2

Re: [PATCH] locale: ensure dcngettext() preserves errno

[A. Wilcox]

[-- Attachment #1.1: Type: text/plain, Size: 253 bytes --]

On 01/27/19 21:34, A. Wilcox wrote:
> Some packages call gettext to format a message to be sent to strerror(3).

Of course, I meant perror(3).  Derpus.

--arw

-- 
A. Wilcox (awilfox)
Project Lead, Adélie Linux
https://www.adelielinux.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]