904N/A--- php-5.3.10/ext/gettext/gettext.c_orig Sun Jan 1 05:15:04 2012
904N/A+++ php-5.3.10/ext/gettext/gettext.c Wed Feb 8 11:25:26 2012
904N/A@@ -117,6 +117,7 @@
904N/A /* }}} */
904N/A
904N/A #include <libintl.h>
904N/A+#include <locale.h>
904N/A
904N/A zend_module_entry php_gettext_module_entry = {
904N/A STANDARD_MODULE_HEADER,
904N/A@@ -344,7 +345,13 @@
904N/A PHP_GETTEXT_LENGTH_CHECK("msgid1", msgid1_len)
904N/A PHP_GETTEXT_LENGTH_CHECK("msgid2", msgid2_len)
904N/A
904N/A- msgstr = dcngettext(domain, msgid1, msgid2, count, category);
904N/A+ if (category > LC_ALL || category < 0) {
904N/A+ /* if we pass higher value than LC_ALL glibc uses LC_ALL.
904N/A+ If not set, this can lead to segfaults on non-gnu systems */
904N/A+ msgstr = dngettext(domain, msgid1, msgid2, count);
904N/A+ } else {
904N/A+ msgstr = dcngettext(domain, msgid1, msgid2, count, category);
904N/A+ }
904N/A
904N/A if (msgstr) {
904N/A RETVAL_STRING(msgstr, 1);