瀏覽代碼

fix null pointer dereference in dcngettext under specific conditions

if setlocale has not been called, the current locale's messages_name
may be a null pointer. the code path where it's assumed to be non-null
was only reachable if bindtextdomain had already been called, which is
normally not done in programs which do not call setlocale, so the
omitted check went unnoticed.

patch from Void Linux, with description rewritten.
Rich Felker 10 年之前
父節點
當前提交
43e9f652bf
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/locale/dcngettext.c

+ 1 - 1
src/locale/dcngettext.c

@@ -132,7 +132,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2,
 	switch (category) {
 	case LC_MESSAGES:
 		locname = loc->messages_name;
-		if (!*locname) goto notrans;
+		if (!locname || !*locname) goto notrans;
 		break;
 	case LC_TIME:
 	case LC_MONETARY: