fixes

Author: ndossche

Zend/zend_API.c

@@ -568,9 +568,9 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 				 * zend_verify_weak_scalar_type_hint_no_sideeffect() */
 				if (arg_num != (uint32_t)-1) {
 					zend_incompatible_double_to_long_error(Z_DVAL_P(arg));
-				}
-				if (UNEXPECTED(EG(exception))) {
-					goto fail;
+					if (UNEXPECTED(EG(exception))) {
+						goto fail;
+					}
 				}
 			}
 			return (zend_opt_long){lval, true};
@@ -596,17 +596,16 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 					 * zend_verify_weak_scalar_type_hint_no_sideeffect() */
 					if (arg_num != (uint32_t)-1) {
 						zend_incompatible_string_to_long_error(Z_STR_P(arg));
-					}
-					if (UNEXPECTED(EG(exception))) {
-						goto fail;
+						if (UNEXPECTED(EG(exception))) {
+							goto fail;
+						}
 					}
 				}
+			} else {
+				goto fail;
 			}
-			return (zend_opt_long){lval, true};
-		}
-		if (UNEXPECTED(EG(exception))) {
-			goto fail;
 		}
+		return (zend_opt_long){lval, true};
 	} else if (EXPECTED(Z_TYPE_P(arg) < IS_TRUE)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("int", arg_num)) {
 			goto fail;
@@ -654,20 +653,13 @@ ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_weak(const zval *ar
 		double d;
 
 		if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), &l, &d)) != IS_DOUBLE)) {
-			zend_opt_double result;
 			if (EXPECTED(type != 0)) {
-				result.value = (double)(l);
-				result.has_value = true;
-			} else {
-				result.has_value = false;
+				return (zend_opt_double){(double)l, true};
 			}
-			return result;
+			goto fail;
 		} else {
 			return (zend_opt_double){d, true};
 		}
-		if (UNEXPECTED(EG(exception))) {
-			goto fail;
-		}
 	} else if (EXPECTED(Z_TYPE_P(arg) < IS_TRUE)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("float", arg_num)) {
 			goto fail;