fxies

Author: ndossche

Zend/zend_API.c

@@ -663,6 +663,7 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_flf_parse_arg_long_slow(const zval *ar
 ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_weak(const zval *arg, uint32_t arg_num) /* {{{ */
 {
 	zend_opt_double result;
+	result.has_value = false;
 	if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
 		result.value = (double)Z_LVAL_P(arg);
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
@@ -677,12 +678,10 @@ ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_weak(const zval *ar
 			return result;
 		}
 		if (UNEXPECTED(EG(exception))) {
-			result.has_value = false;
 			return result;
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) < IS_TRUE)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("float", arg_num)) {
-			result.has_value = false;
 			return result;
 		}
 		result.value = 0.0;

Zend/zend_execute.c

@@ -757,7 +757,7 @@ static bool zend_verify_weak_scalar_type_hint(uint32_t type_mask, zval *arg)
 		zend_opt_double result = zend_parse_arg_double_weak(arg, 0);
 		if (result.has_value) {
 			zval_ptr_dtor(arg);
-			ZVAL_DOUBLE(arg, dval);
+			ZVAL_DOUBLE(arg, result.value);
 			return 1;
 		}
 	}