ext/session: session_start() options arguments type checks.

Author: devnexen

ext/session/session.c

@@ -2636,7 +2636,7 @@ PHP_FUNCTION(session_start)
 	zval *value;
 	zend_ulong num_idx;
 	zend_string *str_idx;
-	zend_long read_and_close = 0;
+	bool read_and_close = false;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|a", &options) == FAILURE) {
 		RETURN_THROWS();
@@ -2659,6 +2659,11 @@ PHP_FUNCTION(session_start)
 
 	/* set options */
 	if (options) {
+		if (UNEXPECTED(HT_IS_PACKED(Z_ARRVAL_P(options)))) {
+			zend_argument_type_error(1, "must be of type array with keys as string");
+			RETURN_THROWS();
+		}
+
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(options), num_idx, str_idx, value) {
 			if (str_idx) {
 				switch(Z_TYPE_P(value)) {
@@ -2667,7 +2672,8 @@ PHP_FUNCTION(session_start)
 					case IS_FALSE:
 					case IS_LONG:
 						if (zend_string_equals_literal(str_idx, "read_and_close")) {
-							read_and_close = zval_get_long(value);
+							zend_long tmp = zval_get_long_ex(value, true);
+							read_and_close = (tmp > 0);
 						} else {
 							zend_string *tmp_val;
 							zend_string *val = zval_get_tmp_string(value, &tmp_val);

ext/session/tests/session_start_read_and_close.phpt

@@ -26,7 +26,7 @@ foreach ($valuesDisablingReadAndClose as $value) {
 
 try {
     session_start(["read_and_close" => 1.0]);
-} catch (Throwable $e) {
+} catch (TypeError $e) {
     echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
@@ -46,4 +46,4 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-TypeError: session_start(): Option "read_and_close" must be of type string|int|bool, float given
+session_start(): Option "read_and_close" must be of type string|int|bool, float given