Return throws when php_mb_get_encoding fails

Author: Girgias

ext/mbstring/mbstring.c

@@ -1939,7 +1939,7 @@ PHP_FUNCTION(mb_str_split)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(encoding);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	p = ZSTR_VAL(str); /* string cursor pointer */
@@ -2068,7 +2068,7 @@ PHP_FUNCTION(mb_strlen)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(enc_name);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	n = mbfl_strlen(&string);
@@ -2097,7 +2097,7 @@ PHP_FUNCTION(mb_strpos)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	if (offset != 0) {
@@ -2152,7 +2152,7 @@ PHP_FUNCTION(mb_strrpos)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	if (offset != 0) {
@@ -2286,7 +2286,7 @@ PHP_FUNCTION(mb_strstr)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	n = mbfl_strpos(&haystack, &needle, 0, 0);
@@ -2332,7 +2332,7 @@ PHP_FUNCTION(mb_strrchr)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	if (haystack.len == 0) {
@@ -2385,7 +2385,7 @@ PHP_FUNCTION(mb_stristr)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(from_encoding);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, 0, from_encoding);
@@ -2431,7 +2431,7 @@ PHP_FUNCTION(mb_strrichr)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(from_encoding);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, 0, from_encoding);
@@ -2476,7 +2476,7 @@ PHP_FUNCTION(mb_substr_count)
 	haystack.no_language = needle.no_language = MBSTRG(language);
 	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
 	if (!haystack.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	if (needle.len == 0) {
@@ -2512,7 +2512,7 @@ PHP_FUNCTION(mb_substr)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(encoding);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	string.val = (unsigned char *)str;
@@ -2575,7 +2575,7 @@ PHP_FUNCTION(mb_strcut)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(encoding);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	if (len_is_null) {
@@ -2632,7 +2632,7 @@ PHP_FUNCTION(mb_strwidth)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(enc_name);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	n = mbfl_strwidth(&string);
@@ -2661,7 +2661,7 @@ PHP_FUNCTION(mb_strimwidth)
 	string.no_language = marker.no_language = MBSTRG(language);
 	string.encoding = marker.encoding = php_mb_get_encoding(encoding);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	string.val = (unsigned char *)str;
@@ -3010,7 +3010,7 @@ PHP_FUNCTION(mb_convert_case)
 
 	enc = php_mb_get_encoding(from_encoding);
 	if (!enc) {
-		return;
+		RETURN_THROWS();
 	}
 
 	if (case_mode < 0 || case_mode > PHP_UNICODE_CASE_MODE_MAX) {
@@ -3047,7 +3047,7 @@ PHP_FUNCTION(mb_strtoupper)
 
 	enc = php_mb_get_encoding(from_encoding);
 	if (!enc) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	newstr = mbstring_convert_case(PHP_UNICODE_CASE_UPPER, str, str_len, &ret_len, enc);
@@ -3081,7 +3081,7 @@ PHP_FUNCTION(mb_strtolower)
 
 	enc = php_mb_get_encoding(from_encoding);
 	if (!enc) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	newstr = mbstring_convert_case(PHP_UNICODE_CASE_LOWER, str, str_len, &ret_len, enc);
@@ -3391,7 +3391,7 @@ PHP_FUNCTION(mb_convert_kana)
 	string.no_language = MBSTRG(language);
 	string.encoding = php_mb_get_encoding(encname);
 	if (!string.encoding) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	ret = mbfl_ja_jp_hantozen(&string, &result, opt);
@@ -4717,7 +4717,7 @@ PHP_FUNCTION(mb_scrub)
 
 	enc = php_mb_get_encoding(enc_name);
 	if (!enc) {
-		RETURN_FALSE;
+		RETURN_THROWS();
 	}
 
 	ret = php_mb_scrub(str, str_len, enc, &ret_len);