New upstream release (7.5p1)

1 files changed, 4 insertions, 2 deletions

diff --git a/utf8.c b/utf8.c
index 87fa9e89a..dead79b8a 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.3 2016/05/30 12:57:21 schwarze 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 @@ dangerous_locale(void) {
         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 && strcmp(loc, "646") != 0;
 }
 
 static int
@@ -116,6 +117,7 @@ vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap)
         sz = strlen(src) + 1;
         if ((dst = malloc(sz)) == NULL) {
                 free(src);
+                ret = -1;
                 goto fail;
         }