more

Author: ndossche

Zend/zend_API.c

@@ -555,15 +555,12 @@ ZEND_API zend_opt_bool ZEND_FASTCALL zend_flf_parse_arg_bool_slow(const zval *ar
 
 ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, uint32_t arg_num) /* {{{ */
 {
-	zend_opt_long result;
-	result.has_value = false;
-
 	if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
 		if (UNEXPECTED(zend_isnan(Z_DVAL_P(arg)))) {
-			return result;
+			goto fail;
 		}
 		if (UNEXPECTED(!ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(arg)))) {
-			return result;
+			goto fail;
 		} else {
 			zend_long lval = zend_dval_to_lval(Z_DVAL_P(arg));
 			if (UNEXPECTED(!zend_is_long_compatible(Z_DVAL_P(arg), lval))) {
@@ -573,23 +570,23 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 					zend_incompatible_double_to_long_error(Z_DVAL_P(arg));
 				}
 				if (UNEXPECTED(EG(exception))) {
-					return result;
+					goto fail;
 				}
 			}
-			result.value = lval;
+			return (zend_opt_long){lval, true};
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
 		double d;
 		uint8_t type;
+		zend_long lval;
 
-		if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), &result.value, &d)) != IS_LONG)) {
+		if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), &lval, &d)) != IS_LONG)) {
 			if (EXPECTED(type != 0)) {
-				zend_long lval;
 				if (UNEXPECTED(zend_isnan(d))) {
-					return result;
+					goto fail;
 				}
 				if (UNEXPECTED(!ZEND_DOUBLE_FITS_LONG(d))) {
-					return result;
+					goto fail;
 				}
 
 				lval = zend_dval_to_lval(d);
@@ -601,28 +598,27 @@ ZEND_API zend_opt_long ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, u
 						zend_incompatible_string_to_long_error(Z_STR_P(arg));
 					}
 					if (UNEXPECTED(EG(exception))) {
-						return result;
+						goto fail;
 					}
 				}
-				result.value = lval;
-			} else {
-				return result;
 			}
+			return (zend_opt_long){lval, true};
 		}
 		if (UNEXPECTED(EG(exception))) {
-			return result;
+			goto fail;
 		}
 	} else if (EXPECTED(Z_TYPE_P(arg) < IS_TRUE)) {
 		if (UNEXPECTED(Z_TYPE_P(arg) == IS_NULL) && !zend_null_arg_deprecated("int", arg_num)) {
-			return result;
+			goto fail;
 		}
-		result.value = 0;
+		return (zend_opt_long){0, true};
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_TRUE)) {
-		result.value = 1;
-	} else {
-		return result;
+		return (zend_opt_long){1, true};
 	}
-	result.has_value = true;
+
+fail:;
+	zend_opt_long result;
+	result.has_value = false;
 	return result;
 }
 /* }}} */
@@ -670,24 +666,21 @@ ZEND_API zend_opt_double ZEND_FASTCALL zend_parse_arg_double_weak(const zval *ar
 			return (zend_opt_double){d, true};
 		}
 		if (UNEXPECTED(EG(exception))) {
-			zend_opt_double result;
-			result.has_value = false;
-			return result;
+			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)) {
-			zend_opt_double result;
-			result.has_value = false;
-			return result;
+			goto fail;
 		}
 		return (zend_opt_double){0.0, true};
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_TRUE)) {
 		return (zend_opt_double){1.0, true};
-	} else {
-		zend_opt_double result;
-		result.has_value = false;
-		return result;
 	}
+
+fail:;
+	zend_opt_double result;
+	result.has_value = false;
+	return result;
 }
 /* }}} */