Changed the return type of safe_pow

Author: jorgsowa

Zend/zend_operators.c

@@ -1292,14 +1292,13 @@ static void ZEND_COLD zend_power_base_0_exponent_lt_0_error(void)
 	zend_error(E_DEPRECATED, "Power of base 0 and negative exponent is deprecated");
 }
 
-static zend_result safe_pow(double *result, double base, double exponent)
+static double safe_pow(double base, double exponent)
 {
 	if (UNEXPECTED(base == 0.0 && exponent < 0.0)) {
 		zend_power_base_0_exponent_lt_0_error();
 	}
 
-	*result = pow(base, exponent);
-	return SUCCESS;
+	return pow(base, exponent);
 }
 
 static zend_result ZEND_FASTCALL pow_function_base(zval *result, zval *op1, zval *op2) /* {{{ */
@@ -1326,44 +1325,32 @@ static zend_result ZEND_FASTCALL pow_function_base(zval *result, zval *op1, zval
 					--i;
 					ZEND_SIGNED_MULTIPLY_LONG(l1, l2, l1, dval, overflow);
 					if (overflow) {
-						double pow_result;
-						safe_pow(&pow_result, l2, i);
-						ZVAL_DOUBLE(result, dval * pow_result);
+						ZVAL_DOUBLE(result, dval * safe_pow(l2, i));
 						return SUCCESS;
 					}
 				} else {
 					i /= 2;
 					ZEND_SIGNED_MULTIPLY_LONG(l2, l2, l2, dval, overflow);
 					if (overflow) {
-						double pow_result;
-						safe_pow(&pow_result, dval, i);
-						ZVAL_DOUBLE(result, (double)l1 * pow_result);
+						ZVAL_DOUBLE(result, (double)l1 * safe_pow(dval, i));
 						return SUCCESS;
 					}
 				}
 			}
 			/* i == 0 */
 			ZVAL_LONG(result, l1);
 		} else {
-			double pow_result;
-			safe_pow(&pow_result, (double)Z_LVAL_P(op1), (double)Z_LVAL_P(op2));
-			ZVAL_DOUBLE(result, pow_result);
+			ZVAL_DOUBLE(result, safe_pow((double)Z_LVAL_P(op1), (double)Z_LVAL_P(op2)));
 		}
 		return SUCCESS;
 	} else if (EXPECTED(type_pair == TYPE_PAIR(IS_DOUBLE, IS_DOUBLE))) {
-		double pow_result;
-		safe_pow(&pow_result, Z_DVAL_P(op1), Z_DVAL_P(op2));
-		ZVAL_DOUBLE(result, pow_result);
+		ZVAL_DOUBLE(result, safe_pow(Z_DVAL_P(op1), Z_DVAL_P(op2)));
 		return SUCCESS;
 	} else if (EXPECTED(type_pair == TYPE_PAIR(IS_LONG, IS_DOUBLE))) {
-		double pow_result;
-		safe_pow(&pow_result, (double)Z_LVAL_P(op1), Z_DVAL_P(op2));
-		ZVAL_DOUBLE(result, pow_result);
+		ZVAL_DOUBLE(result, safe_pow((double)Z_LVAL_P(op1), Z_DVAL_P(op2)));
 		return SUCCESS;
 	} else if (EXPECTED(type_pair == TYPE_PAIR(IS_DOUBLE, IS_LONG))) {
-		double pow_result;
-		safe_pow(&pow_result, Z_DVAL_P(op1), (double)Z_LVAL_P(op2));
-		ZVAL_DOUBLE(result, pow_result);
+		ZVAL_DOUBLE(result, safe_pow(Z_DVAL_P(op1), (double)Z_LVAL_P(op2)));
 		return SUCCESS;
 	} else {
 		return FAILURE;