wip

Author: SakiTakamachi

ext/bcmath/bcmath.c

@@ -848,7 +848,7 @@ static zend_object *bcmath_number_clone(zend_object *object)
 	return &clone->std;
 }
 
-static inline zend_result bc_num_from_zval(const zval *zv, bc_num *num, size_t *full_scale, uint32_t arg_num)
+static inline zend_result bc_num_from_zval(const zval *zv, bc_num *num, size_t *full_scale)
 {
 	switch (Z_TYPE_P(zv)) {
 		case IS_LONG:
@@ -860,7 +860,6 @@ static inline zend_result bc_num_from_zval(const zval *zv, bc_num *num, size_t *
 
 		case IS_STRING:
 			if (php_str2num_ex(num, Z_STR_P(zv), full_scale) == FAILURE) {
-				zend_argument_value_error(arg_num, "is not well-formed");
 				bc_free_num(num);
 				return FAILURE;
 			}
@@ -878,13 +877,21 @@ static inline zend_result bc_num_from_zval(const zval *zv, bc_num *num, size_t *
 			ZEND_FALLTHROUGH;
 
 		default:
-			zend_argument_type_error(arg_num, "must be of type int, string, or %s, %s given", ZSTR_VAL(Z_OBJ_P(zv)->ce->name), zend_zval_value_name(zv));
 			return FAILURE;
 	}
 
 	return SUCCESS;
 }
 
+static inline void bc_num_from_zval_error_message(const zval *zv, uint32_t arg_num)
+{
+	if (Z_TYPE_P(zv) == IS_STRING) {
+		zend_argument_value_error(arg_num, "is not well-formed");
+	} else {
+		zend_argument_type_error(arg_num, "must be of type int, string, or %s, %s given", ZSTR_VAL(bcmath_number_ce->name), zend_zval_value_name(zv));
+	}
+}
+
 static HashTable *bcmath_number_get_properties_for(zend_object *obj, zend_prop_purpose purpose)
 {
 	switch (purpose) {
@@ -1101,7 +1108,7 @@ static zend_result bcmath_number_do_operation(uint8_t opcode, zval *ret_val, zva
 	bc_num n1 = NULL, n2 = NULL;
 	size_t n1_full_scale, n2_full_scale;
 
-	if (UNEXPECTED(bc_num_from_zval(op1, &n1, &n1_full_scale, 0) == FAILURE || bc_num_from_zval(op2, &n2, &n2_full_scale, 0) == FAILURE)) {
+	if (UNEXPECTED(bc_num_from_zval(op1, &n1, &n1_full_scale) == FAILURE || bc_num_from_zval(op2, &n2, &n2_full_scale) == FAILURE)) {
 		goto fail;
 	}
 
@@ -1170,14 +1177,23 @@ static zend_result bcmath_number_do_operation(uint8_t opcode, zval *ret_val, zva
 	return FAILURE;
 }
 
-static int bcmath_number_compare(zval *z1, zval *z2)
+static int bcmath_number_compare(zval *op1, zval *op2)
 {
-	ZEND_COMPARE_OBJECTS_FALLBACK(z1, z2);
+	bc_num n1 = NULL, n2 = NULL;
+	if (UNEXPECTED(bc_num_from_zval(op1, &n1, NULL) == FAILURE || bc_num_from_zval(op2, &n2, NULL) == FAILURE)) {
+		return zend_std_compare_objects(op1, op2);
+	}
 
-	bcmath_number_obj_t *n1 = get_bcmath_number_from_zval(z1);
-	bcmath_number_obj_t *n2 = get_bcmath_number_from_zval(z2);
+	int ret = bc_compare(n1, n2);
+
+	if (n1 && Z_TYPE_P(op1) != IS_OBJECT) {
+		bc_free_num(&n1);
+	}
+	if (n2 && Z_TYPE_P(op2) != IS_OBJECT) {
+		bc_free_num(&n2);
+	}
 
-	return bc_compare(n1->num, n2->num);
+	return ret;
 }
 
 PHP_METHOD(BcMath_Number, __construct)
@@ -1192,7 +1208,8 @@ PHP_METHOD(BcMath_Number, __construct)
 
 	bc_num num = NULL;
 	size_t scale;
-	if (bc_num_from_zval(zv, &num, &scale, 1) == FAILURE) {
+	if (bc_num_from_zval(zv, &num, &scale) == FAILURE) {
+		bc_num_from_zval_error_message(zv, 1);
 		RETURN_THROWS();
 	}
 
@@ -1223,7 +1240,8 @@ static inline zend_result bc_check_scale(zend_long scale, bool scale_is_null, ui
 	bc_num num = NULL; \
 	size_t num_full_scale; \
 \
-	if (bc_num_from_zval(zv, &num, &num_full_scale, 1) == FAILURE) { \
+	if (bc_num_from_zval(zv, &num, &num_full_scale) == FAILURE) { \
+		bc_num_from_zval_error_message(zv, 1); \
 		RETURN_THROWS(); \
 	} \
 \
@@ -1317,24 +1335,24 @@ PHP_METHOD(BcMath_Number, powmod)
 		Z_PARAM_LONG_OR_NULL(arg_scale, scale_is_null);
 	ZEND_PARSE_PARAMETERS_END();
 
-	bcmath_number_obj_t *intern = get_bcmath_number_from_zval(ZEND_THIS);
-
 	bc_num exponent_num = NULL;
 	bc_num modulus_num = NULL;
 
-	if (bc_num_from_zval(exponent, &exponent_num, NULL, 1) == FAILURE) {
+	if (bc_num_from_zval(exponent, &exponent_num, NULL) == FAILURE) {
+		bc_num_from_zval_error_message(exponent, 1);
 		goto cleanup;
 	}
-	if (bc_num_from_zval(modulus, &modulus_num, NULL, 2) == FAILURE) {
+	if (bc_num_from_zval(modulus, &modulus_num, NULL) == FAILURE) {
+		bc_num_from_zval_error_message(modulus, 2);
 		goto cleanup;
 	}
 	if (bc_check_scale(arg_scale, scale_is_null, 3) == FAILURE) {
 		goto cleanup;
 	}
 
-	size_t scale = 0;
-
+	bcmath_number_obj_t *intern = get_bcmath_number_from_zval(ZEND_THIS);
 	bc_num ret = NULL;
+	size_t scale = scale_is_null ? 0 : arg_scale;
 	raise_mod_status status = bc_raisemod(intern->num, exponent_num, modulus_num, &ret, scale);
 	switch (status) {
 		case BASE_HAS_FRACTIONAL:
@@ -1424,7 +1442,8 @@ PHP_METHOD(BcMath_Number, comp)
 	ZEND_PARSE_PARAMETERS_END();
 
 	bc_num num = NULL;
-	if (bc_num_from_zval(zv, &num, NULL, 1) == FAILURE) {
+	if (bc_num_from_zval(zv, &num, NULL) == FAILURE) {
+		bc_num_from_zval_error_message(zv, 1);
 		RETURN_THROWS();
 	}