Merge branch 'PHP-8.2' into PHP-8.3

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.3.5
 
+- Gettext:
+  - Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5
+    with category set to LC_ALL. (David Carlier)
+
 - MySQLnd:
   . Fix GH-13452 (Fixed handshake response [mysqlnd]). (Saki Takamachi)
 

UPGRADING

@@ -196,6 +196,10 @@ PHP 8.3 UPGRADE NOTES
   . Calling ldap_connect() with separate hostname and port is deprecated.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_3#deprecate_calling_ldap_connect_with_2_parameters
 
+- Gettext:
+  . dcgettext/dcngettext throw now an exception if the category's argument if set to
+    `LC_ALL`.
+
 - MBString
   . Passing a negative $width to mb_strimwidth() is now deprecated.
 

ext/gettext/gettext.c

@@ -23,6 +23,7 @@
 #ifdef HAVE_LIBINTL
 
 #include <stdio.h>
+#include <locale.h>
 #include "ext/standard/info.h"
 #include "php_gettext.h"
 #include "gettext_arginfo.h"
@@ -61,6 +62,12 @@ ZEND_GET_MODULE(php_gettext)
 		RETURN_THROWS(); \
 	}
 
+#define PHP_DCGETTEXT_CATEGORY_CHECK(_arg_num, category) \
+	if (category == LC_ALL) { \
+		zend_argument_value_error(_arg_num, "cannot be LC_ALL"); \
+		RETURN_THROWS(); \
+	}
+
 PHP_MINFO_FUNCTION(php_gettext)
 {
 	php_info_print_table_start();
@@ -146,6 +153,7 @@ PHP_FUNCTION(dcgettext)
 
 	PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
 	PHP_GETTEXT_LENGTH_CHECK(2, ZSTR_LEN(msgid))
+	PHP_DCGETTEXT_CATEGORY_CHECK(3, category)
 
 	msgstr = dcgettext(ZSTR_VAL(domain), ZSTR_VAL(msgid), category);
 
@@ -260,6 +268,7 @@ PHP_FUNCTION(dcngettext)
 	PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, domain_len)
 	PHP_GETTEXT_LENGTH_CHECK(2, msgid1_len)
 	PHP_GETTEXT_LENGTH_CHECK(3, msgid2_len)
+	PHP_DCGETTEXT_CATEGORY_CHECK(5, category)
 
 	msgstr = dcngettext(domain, msgid1, msgid2, count, category);
 

ext/gettext/tests/dcgettext_lcall.phpt

@@ -0,0 +1,21 @@
+--TEST--
+dcgettext with LC_ALL is undefined behavior.
+--EXTENSIONS--
+gettext
+--FILE--
+<?php
+try {
+	dcgettext('dngettextTest', 'item', LC_ALL);
+} catch (ValueError $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+	dcngettext('dngettextTest', 'item', 'item2', 1, LC_ALL);
+} catch (ValueError $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECTF--
+dcgettext(): Argument #3 ($category) cannot be LC_ALL
+dcngettext(): Argument #5 ($category) cannot be LC_ALL

ext/gettext/tests/dcngettext.phpt

@@ -11,10 +11,10 @@ if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
 
 var_dump(dcngettext(1,1,1,1,1));
 var_dump(dcngettext("test","test","test",1,1));
-var_dump(dcngettext("test","test","test",0,0));
+var_dump(dcngettext("test","test","test",0,1));
 var_dump(dcngettext("test","test","test",-1,-1));
 var_dump(dcngettext("","","",1,1));
-var_dump(dcngettext("","","",0,0));
+var_dump(dcngettext("","","",0,1));
 
 echo "Done\n";
 ?>