Skip to content

Commit a9571fc

Browse files
GirgiasGirgias
committed
Return throws when php_mb_get_encoding fails
1 parent 8f3f412 commit a9571fc

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎ext/mbstring/mbstring.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,7 +1939,7 @@ PHP_FUNCTION(mb_str_split)
19391939
string.no_language = MBSTRG(language);
19401940
string.encoding = php_mb_get_encoding(encoding);
19411941
if (!string.encoding) {
1942-
RETURN_FALSE;
1942+
RETURN_THROWS();
19431943
}
19441944

19451945
p = ZSTR_VAL(str); /* string cursor pointer */
@@ -2068,7 +2068,7 @@ PHP_FUNCTION(mb_strlen)
20682068
string.no_language = MBSTRG(language);
20692069
string.encoding = php_mb_get_encoding(enc_name);
20702070
if (!string.encoding) {
2071-
RETURN_FALSE;
2071+
RETURN_THROWS();
20722072
}
20732073

20742074
n = mbfl_strlen(&string);
@@ -2113,7 +2113,7 @@ PHP_FUNCTION(mb_strpos)
21132113
haystack.no_language = needle.no_language = MBSTRG(language);
21142114
haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
21152115
if (!haystack.encoding) {
2116-
RETURN_FALSE;
2116+
RETURN_THROWS();
21172117
}
21182118

21192119
n = mbfl_strpos(&haystack, &needle, offset, reverse);
@@ -2141,7 +2141,7 @@ PHP_FUNCTION(mb_strrpos)
21412141
haystack.no_language = needle.no_language = MBSTRG(language);
21422142
haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
21432143
if (!haystack.encoding) {
2144-
RETURN_FALSE;
2144+
RETURN_THROWS();
21452145
}
21462146

21472147
n = mbfl_strpos(&haystack, &needle, offset, 1);
@@ -2218,7 +2218,7 @@ PHP_FUNCTION(mb_strstr)
22182218
haystack.no_language = needle.no_language = MBSTRG(language);
22192219
haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
22202220
if (!haystack.encoding) {
2221-
RETURN_FALSE;
2221+
RETURN_THROWS();
22222222
}
22232223

22242224
n = mbfl_strpos(&haystack, &needle, 0, 0);
@@ -2264,7 +2264,7 @@ PHP_FUNCTION(mb_strrchr)
22642264
haystack.no_language = needle.no_language = MBSTRG(language);
22652265
haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
22662266
if (!haystack.encoding) {
2267-
RETURN_FALSE;
2267+
RETURN_THROWS();
22682268
}
22692269

22702270
if (haystack.len == 0) {
@@ -2317,7 +2317,7 @@ PHP_FUNCTION(mb_stristr)
23172317
haystack.no_language = needle.no_language = MBSTRG(language);
23182318
haystack.encoding = needle.encoding = php_mb_get_encoding(from_encoding);
23192319
if (!haystack.encoding) {
2320-
RETURN_FALSE;
2320+
RETURN_THROWS();
23212321
}
23222322

23232323
n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, 0, from_encoding);
@@ -2363,7 +2363,7 @@ PHP_FUNCTION(mb_strrichr)
23632363
haystack.no_language = needle.no_language = MBSTRG(language);
23642364
haystack.encoding = needle.encoding = php_mb_get_encoding(from_encoding);
23652365
if (!haystack.encoding) {
2366-
RETURN_FALSE;
2366+
RETURN_THROWS();
23672367
}
23682368

23692369
n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, 0, from_encoding);
@@ -2408,7 +2408,7 @@ PHP_FUNCTION(mb_substr_count)
24082408
haystack.no_language = needle.no_language = MBSTRG(language);
24092409
haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
24102410
if (!haystack.encoding) {
2411-
RETURN_FALSE;
2411+
RETURN_THROWS();
24122412
}
24132413

24142414
if (needle.len == 0) {
@@ -2444,7 +2444,7 @@ PHP_FUNCTION(mb_substr)
24442444
string.no_language = MBSTRG(language);
24452445
string.encoding = php_mb_get_encoding(encoding);
24462446
if (!string.encoding) {
2447-
RETURN_FALSE;
2447+
RETURN_THROWS();
24482448
}
24492449

24502450
string.val = (unsigned char *)str;
@@ -2507,7 +2507,7 @@ PHP_FUNCTION(mb_strcut)
25072507
string.no_language = MBSTRG(language);
25082508
string.encoding = php_mb_get_encoding(encoding);
25092509
if (!string.encoding) {
2510-
RETURN_FALSE;
2510+
RETURN_THROWS();
25112511
}
25122512

25132513
if (len_is_null) {
@@ -2564,7 +2564,7 @@ PHP_FUNCTION(mb_strwidth)
25642564
string.no_language = MBSTRG(language);
25652565
string.encoding = php_mb_get_encoding(enc_name);
25662566
if (!string.encoding) {
2567-
RETURN_FALSE;
2567+
RETURN_THROWS();
25682568
}
25692569

25702570
n = mbfl_strwidth(&string);
@@ -2593,7 +2593,7 @@ PHP_FUNCTION(mb_strimwidth)
25932593
string.no_language = marker.no_language = MBSTRG(language);
25942594
string.encoding = marker.encoding = php_mb_get_encoding(encoding);
25952595
if (!string.encoding) {
2596-
RETURN_FALSE;
2596+
RETURN_THROWS();
25972597
}
25982598

25992599
string.val = (unsigned char *)str;
@@ -2942,7 +2942,7 @@ PHP_FUNCTION(mb_convert_case)
29422942

29432943
enc = php_mb_get_encoding(from_encoding);
29442944
if (!enc) {
2945-
return;
2945+
RETURN_THROWS();
29462946
}
29472947

29482948
if (case_mode < 0 || case_mode > PHP_UNICODE_CASE_MODE_MAX) {
@@ -2979,7 +2979,7 @@ PHP_FUNCTION(mb_strtoupper)
29792979

29802980
enc = php_mb_get_encoding(from_encoding);
29812981
if (!enc) {
2982-
RETURN_FALSE;
2982+
RETURN_THROWS();
29832983
}
29842984

29852985
newstr = mbstring_convert_case(PHP_UNICODE_CASE_UPPER, str, str_len, &ret_len, enc);
@@ -3013,7 +3013,7 @@ PHP_FUNCTION(mb_strtolower)
30133013

30143014
enc = php_mb_get_encoding(from_encoding);
30153015
if (!enc) {
3016-
RETURN_FALSE;
3016+
RETURN_THROWS();
30173017
}
30183018

30193019
newstr = mbstring_convert_case(PHP_UNICODE_CASE_LOWER, str, str_len, &ret_len, enc);
@@ -3323,7 +3323,7 @@ PHP_FUNCTION(mb_convert_kana)
33233323
string.no_language = MBSTRG(language);
33243324
string.encoding = php_mb_get_encoding(encname);
33253325
if (!string.encoding) {
3326-
RETURN_FALSE;
3326+
RETURN_THROWS();
33273327
}
33283328

33293329
ret = mbfl_ja_jp_hantozen(&string, &result, opt);
@@ -4649,7 +4649,7 @@ PHP_FUNCTION(mb_scrub)
46494649

46504650
enc = php_mb_get_encoding(enc_name);
46514651
if (!enc) {
4652-
RETURN_FALSE;
4652+
RETURN_THROWS();
46534653
}
46544654

46554655
ret = php_mb_scrub(str, str_len, enc, &ret_len);

0 commit comments

Comments
 (0)