Locale::setDefault

Author: devnexen

ext/intl/locale/locale_methods.c

@@ -315,7 +315,7 @@ PHP_NAMED_FUNCTION(zif_locale_set_default)
 	char *default_locale = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(locale_name)
+		Z_PARAM_PATH_STR(locale_name)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ZSTR_LEN(locale_name) == 0) {

ext/intl/tests/locale_set_default.phpt

@@ -86,6 +86,12 @@ function ut_main()
         $res_str .= "\n";
     }
 
+    try {
+    	ut_loc_set_default("a-\0DE");
+    } catch (\ValueError $e) {
+	echo $e->getMessage(), PHP_EOL;
+    }
+
     return $res_str;
 
 }
@@ -95,6 +101,8 @@ ut_run();
 
 ?>
 --EXPECT--
+Locale::setDefault(): Argument #1 ($locale) must not contain any null bytes
+locale_set_default(): Argument #1 ($locale) must not contain any null bytes
 uk-ua_CALIFORNIA@currency=;currency=GRN: set locale 'uk-ua_CALIFORNIA@currency=;currency=GRN'
 root: set locale 'root'
 uk@currency=EURO: set locale 'uk@currency=EURO'