Skip to content

Commit 124bce3

Browse files
committed
Fix argument nullability in mbstring
These arguments were declared nullable in stubs (and should be nullable), but didn't accept null in zpp.
1 parent 7b0f5f4 commit 124bce3

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

ext/mbstring/mbstring.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ PHP_FUNCTION(mb_language)
11931193

11941194
ZEND_PARSE_PARAMETERS_START(0, 1)
11951195
Z_PARAM_OPTIONAL
1196-
Z_PARAM_STR(name)
1196+
Z_PARAM_STR_OR_NULL(name)
11971197
ZEND_PARSE_PARAMETERS_END();
11981198

11991199
if (name == NULL) {
@@ -1221,7 +1221,7 @@ PHP_FUNCTION(mb_internal_encoding)
12211221

12221222
ZEND_PARSE_PARAMETERS_START(0, 1)
12231223
Z_PARAM_OPTIONAL
1224-
Z_PARAM_STRING(name, name_len)
1224+
Z_PARAM_STRING_OR_NULL(name, name_len)
12251225
ZEND_PARSE_PARAMETERS_END();
12261226

12271227
if (name == NULL) {
@@ -1252,7 +1252,7 @@ PHP_FUNCTION(mb_http_input)
12521252

12531253
ZEND_PARSE_PARAMETERS_START(0, 1)
12541254
Z_PARAM_OPTIONAL
1255-
Z_PARAM_STRING(type, type_len)
1255+
Z_PARAM_STRING_OR_NULL(type, type_len)
12561256
ZEND_PARSE_PARAMETERS_END();
12571257

12581258
if (type == NULL) {
@@ -1328,7 +1328,7 @@ PHP_FUNCTION(mb_http_output)
13281328

13291329
ZEND_PARSE_PARAMETERS_START(0, 1)
13301330
Z_PARAM_OPTIONAL
1331-
Z_PARAM_STRING(name, name_len)
1331+
Z_PARAM_STRING_OR_NULL(name, name_len)
13321332
ZEND_PARSE_PARAMETERS_END();
13331333

13341334
if (name == NULL) {
@@ -1866,7 +1866,7 @@ PHP_FUNCTION(mb_strpos)
18661866
Z_PARAM_STRING(needle_val, needle.len)
18671867
Z_PARAM_OPTIONAL
18681868
Z_PARAM_LONG(offset)
1869-
Z_PARAM_STR(enc_name)
1869+
Z_PARAM_STR_OR_NULL(enc_name)
18701870
ZEND_PARSE_PARAMETERS_END();
18711871

18721872
haystack.val = (unsigned char*)haystack_val;
@@ -1900,7 +1900,7 @@ PHP_FUNCTION(mb_strrpos)
19001900
Z_PARAM_STRING(needle_val, needle.len)
19011901
Z_PARAM_OPTIONAL
19021902
Z_PARAM_LONG(offset)
1903-
Z_PARAM_STR(enc_name)
1903+
Z_PARAM_STR_OR_NULL(enc_name)
19041904
ZEND_PARSE_PARAMETERS_END();
19051905

19061906
haystack.val = (unsigned char*)haystack_val;
@@ -1934,7 +1934,7 @@ PHP_FUNCTION(mb_stripos)
19341934
Z_PARAM_STRING(needle_val, needle.len)
19351935
Z_PARAM_OPTIONAL
19361936
Z_PARAM_LONG(offset)
1937-
Z_PARAM_STR(from_encoding)
1937+
Z_PARAM_STR_OR_NULL(from_encoding)
19381938
ZEND_PARSE_PARAMETERS_END();
19391939

19401940
haystack.val = (unsigned char*)haystack_val;
@@ -1969,7 +1969,7 @@ PHP_FUNCTION(mb_strripos)
19691969
Z_PARAM_STRING(needle_val, needle.len)
19701970
Z_PARAM_OPTIONAL
19711971
Z_PARAM_LONG(offset)
1972-
Z_PARAM_STR(from_encoding)
1972+
Z_PARAM_STR_OR_NULL(from_encoding)
19731973
ZEND_PARSE_PARAMETERS_END();
19741974

19751975
haystack.val = (unsigned char*)haystack_val;
@@ -2010,7 +2010,7 @@ static void php_mb_strstr_variants(INTERNAL_FUNCTION_PARAMETERS, unsigned int va
20102010
Z_PARAM_STRING(needle_val, needle.len)
20112011
Z_PARAM_OPTIONAL
20122012
Z_PARAM_BOOL(part)
2013-
Z_PARAM_STR(encoding_name)
2013+
Z_PARAM_STR_OR_NULL(encoding_name)
20142014
ZEND_PARSE_PARAMETERS_END();
20152015

20162016
haystack.val = (unsigned char*)haystack_val;
@@ -2093,7 +2093,7 @@ PHP_FUNCTION(mb_substr_count)
20932093
Z_PARAM_STRING(haystack_val, haystack.len)
20942094
Z_PARAM_STRING(needle_val, needle.len)
20952095
Z_PARAM_OPTIONAL
2096-
Z_PARAM_STR(enc_name)
2096+
Z_PARAM_STR_OR_NULL(enc_name)
20972097
ZEND_PARSE_PARAMETERS_END();
20982098

20992099
haystack.val = (unsigned char*)haystack_val;
@@ -2135,7 +2135,7 @@ PHP_FUNCTION(mb_substr)
21352135
Z_PARAM_LONG(from)
21362136
Z_PARAM_OPTIONAL
21372137
Z_PARAM_LONG_OR_NULL(len, len_is_null)
2138-
Z_PARAM_STR(encoding)
2138+
Z_PARAM_STR_OR_NULL(encoding)
21392139
ZEND_PARSE_PARAMETERS_END();
21402140

21412141
string.encoding = php_mb_get_encoding(encoding, 4);
@@ -2199,7 +2199,7 @@ PHP_FUNCTION(mb_strcut)
21992199
Z_PARAM_LONG(from)
22002200
Z_PARAM_OPTIONAL
22012201
Z_PARAM_LONG_OR_NULL(len, len_is_null)
2202-
Z_PARAM_STR(encoding)
2202+
Z_PARAM_STR_OR_NULL(encoding)
22032203
ZEND_PARSE_PARAMETERS_END();
22042204

22052205
string.val = (unsigned char*)string_val;
@@ -2255,7 +2255,7 @@ PHP_FUNCTION(mb_strwidth)
22552255
ZEND_PARSE_PARAMETERS_START(1, 2)
22562256
Z_PARAM_STRING(string_val, string.len)
22572257
Z_PARAM_OPTIONAL
2258-
Z_PARAM_STR(enc_name)
2258+
Z_PARAM_STR_OR_NULL(enc_name)
22592259
ZEND_PARSE_PARAMETERS_END();
22602260

22612261
string.val = (unsigned char*)string_val;
@@ -2285,7 +2285,7 @@ PHP_FUNCTION(mb_strimwidth)
22852285
Z_PARAM_LONG(width)
22862286
Z_PARAM_OPTIONAL
22872287
Z_PARAM_STRING(trimmarker, trimmarker_len)
2288-
Z_PARAM_STR(encoding)
2288+
Z_PARAM_STR_OR_NULL(encoding)
22892289
ZEND_PARSE_PARAMETERS_END();
22902290

22912291
string.encoding = marker.encoding = php_mb_get_encoding(encoding, 5);
@@ -2587,7 +2587,7 @@ PHP_FUNCTION(mb_convert_case)
25872587
Z_PARAM_STRING(str, str_len)
25882588
Z_PARAM_LONG(case_mode)
25892589
Z_PARAM_OPTIONAL
2590-
Z_PARAM_STR(from_encoding)
2590+
Z_PARAM_STR_OR_NULL(from_encoding)
25912591
ZEND_PARSE_PARAMETERS_END();
25922592

25932593
const mbfl_encoding *enc = php_mb_get_encoding(from_encoding, 3);
@@ -2620,7 +2620,7 @@ PHP_FUNCTION(mb_strtoupper)
26202620
ZEND_PARSE_PARAMETERS_START(1, 2)
26212621
Z_PARAM_STRING(str, str_len)
26222622
Z_PARAM_OPTIONAL
2623-
Z_PARAM_STR(from_encoding)
2623+
Z_PARAM_STR_OR_NULL(from_encoding)
26242624
ZEND_PARSE_PARAMETERS_END();
26252625

26262626
const mbfl_encoding *enc = php_mb_get_encoding(from_encoding, 2);
@@ -2651,7 +2651,7 @@ PHP_FUNCTION(mb_strtolower)
26512651
ZEND_PARSE_PARAMETERS_START(1, 2)
26522652
Z_PARAM_STRING(str, str_len)
26532653
Z_PARAM_OPTIONAL
2654-
Z_PARAM_STR(from_encoding)
2654+
Z_PARAM_STR_OR_NULL(from_encoding)
26552655
ZEND_PARSE_PARAMETERS_END();
26562656

26572657
enc = php_mb_get_encoding(from_encoding, 2);
@@ -2864,7 +2864,7 @@ PHP_FUNCTION(mb_convert_kana)
28642864
Z_PARAM_STRING(string_val, string.len)
28652865
Z_PARAM_OPTIONAL
28662866
Z_PARAM_STRING(optstr, optstr_len)
2867-
Z_PARAM_STR(encname)
2867+
Z_PARAM_STR_OR_NULL(encname)
28682868
ZEND_PARSE_PARAMETERS_END();
28692869

28702870
string.val = (unsigned char*)string_val;
@@ -3195,7 +3195,7 @@ PHP_FUNCTION(mb_encode_numericentity)
31953195
Z_PARAM_STRING(str, string.len)
31963196
Z_PARAM_ARRAY_HT(target_hash)
31973197
Z_PARAM_OPTIONAL
3198-
Z_PARAM_STR(encoding)
3198+
Z_PARAM_STR_OR_NULL(encoding)
31993199
Z_PARAM_BOOL(is_hex)
32003200
ZEND_PARSE_PARAMETERS_END();
32013201

@@ -3232,7 +3232,7 @@ PHP_FUNCTION(mb_decode_numericentity)
32323232
Z_PARAM_STRING(str, string.len)
32333233
Z_PARAM_ARRAY_HT(target_hash)
32343234
Z_PARAM_OPTIONAL
3235-
Z_PARAM_STR(encoding)
3235+
Z_PARAM_STR_OR_NULL(encoding)
32363236
ZEND_PARSE_PARAMETERS_END();
32373237

32383238
string.val = (unsigned char *)str;

0 commit comments

Comments
 (0)