From 6c5e4d1ee29eebdf60b673e4988df8670b260c9c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 18 May 2015 12:31:15 +0200 Subject: [PATCH] musl: workaround a NULL pointer dereference in dcngettext(). --- .../patches/dcngettext-deref-NULL-pointer.patch | 13 +++++++++++++ srcpkgs/musl/template | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch diff --git a/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch b/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch new file mode 100644 index 00000000000..a4cbd02fba8 --- /dev/null +++ b/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch @@ -0,0 +1,13 @@ +Fix a NULL pointer dereference in case CURRENT_LOCALE is not set up properly. + +--- src/locale/dcngettext.c.orig 2015-05-18 12:29:14.897996949 +0200 ++++ src/locale/dcngettext.c 2015-05-18 12:29:26.730132449 +0200 +@@ -132,7 +132,7 @@ char *dcngettext(const char *domainname, + 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: diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 05680900e70..0dddc1d48ca 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl version=1.1.9 -revision=2 +revision=3 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" conflicts="glibc>=0"