diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-02-19 00:10:57 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-02-19 11:18:42 +1100 |
commit | 011c8ffbb0275281a0cf330054cf21be10c43e37 (patch) | |
tree | 64e11ed6b6ccec165f01efb11c6c5467abdc8775 | |
parent | 0c4430a19b73058a569573492f55e4c9eeaae67b (diff) |
upstream commit
Add a common nl_langinfo(CODESET) alias for US-ASCII
"ANSI_X3.4-1968" that is used by Linux. Fixes mprintf output truncation for
non-UTF-8 locales on Linux spotted by dtucker@; ok deraadt@ schwarze@
Upstream-ID: c6808956ebffd64066f9075d839f74ff0dd60719
-rw-r--r-- | utf8.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: utf8.c,v 1.4 2017/02/02 10:54:25 jsg Exp $ */ | 1 | /* $OpenBSD: utf8.c,v 1.5 2017/02/19 00:10:57 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> | 3 | * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> |
4 | * | 4 | * |
@@ -60,7 +60,8 @@ dangerous_locale(void) { | |||
60 | char *loc; | 60 | char *loc; |
61 | 61 | ||
62 | loc = nl_langinfo(CODESET); | 62 | loc = nl_langinfo(CODESET); |
63 | return strcmp(loc, "US-ASCII") && strcmp(loc, "UTF-8"); | 63 | return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 && |
64 | strcmp(loc, "ANSI_X3.4-1968") != 0; | ||
64 | } | 65 | } |
65 | 66 | ||
66 | static int | 67 | static int |