commit 011c8ffbb0275281a0cf330054cf21be10c43e37
author djm@openbsd.org <djm@openbsd.org> Sun Feb 19 00:10:57 2017 +0000
committer Damien Miller <djm@mindrot.org> Sun Feb 19 11:18:42 2017 +1100
tree 64e11ed6b6ccec165f01efb11c6c5467abdc8775
parent 0c4430a19b73058a569573492f55e4c9eeaae67b

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

utf8.c

diff --git a/utf8.c b/utf8.c
index ba60d61..f2c89a2 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.4 2017/02/02 10:54:25 jsg Exp $ */
+/* $OpenBSD: utf8.c,v 1.5 2017/02/19 00:10:57 djm Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -60,7 +60,8 @@
 	char	*loc;
 
 	loc = nl_langinfo(CODESET);
-	return strcmp(loc, "US-ASCII") && strcmp(loc, "UTF-8");
+	return strcmp(loc, "US-ASCII") != 0 && strcmp(loc, "UTF-8") != 0 &&
+	    strcmp(loc, "ANSI_X3.4-1968") != 0;
 }
 
 static int