Throw on invalid mb_http_input() type

php · Sep 7, 2020 · 623bf96 · 623bf96
1 parent ace876c
commit 623bf96
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -1377,9 +1377,9 @@ PHP_FUNCTION(mb_http_input)
 			mbfl_string_clear(&result);
 			return;
 		default:
-			// TODO ValueError
-			encoding = MBSTRG(http_input_identify);
-			break;
+			zend_argument_value_error(1,
+				"must be one of \"G\", \"P\", \"C\", \"S\", \"I\" or \"L\"");
+			RETURN_THROWS();
 		}
 	}
 

diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
@@ -20,10 +20,27 @@ echo $_GET['b']."\n";
 // Get encoding
 var_dump(mb_http_input('P'));
 var_dump(mb_http_input('G'));
+var_dump(mb_http_input('C'));
+var_dump(mb_http_input('S'));
+var_dump(mb_http_input('I'));
+var_dump(mb_http_input('L'));
+try {
+    var_dump(mb_http_input('Q'));
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
 --EXPECT--
 Ã†Ã¼Ã‹ÃœÂ¸Ã¬0123456789Ã†Ã¼Ã‹ÃœÂ¸Ã¬Â¥Â«Â¥Â¿Â¥Â«Â¥ÃŠÂ¤Ã’Â¤Ã©Â¤Â¬Â¤ÃŠ
 Ã†Ã¼Ã‹ÃœÂ¸Ã¬0123456789Ã†Ã¼Ã‹ÃœÂ¸Ã¬Â¥Â«Â¥Â¿Â¥Â«Â¥ÃŠÂ¤Ã’Â¤Ã©Â¤Â¬Â¤ÃŠ
 string(10) "ISO-8859-1"
 string(10) "ISO-8859-1"
+bool(false)
+bool(false)
+array(1) {
+  [0]=>
+  string(10) "ISO-8859-1"
+}
+string(10) "ISO-8859-1"
+mb_http_input(): Argument #1 ($type) must be one of "G", "P", "C", "S", "I" or "L"