WIP

Author: SakiTakamachi

ext/bcmath/bcmath.c

@@ -799,12 +799,11 @@ static inline bcmath_number_obj_t *get_bcmath_number_from_zval(zval *zv) {
 
 static zend_object *bcmath_number_create(zend_class_entry *ce)
 {
-	bcmath_number_obj_t *intern;
+	bcmath_number_obj_t *intern = zend_object_alloc(sizeof(bcmath_number_obj_t), ce);
 
-	intern = zend_object_alloc(sizeof(bcmath_number_obj_t), ce);
 	zend_object_std_init(&intern->std, ce);
 	object_properties_init(&intern->std, ce);
-	rebuild_object_properties(&intern->std);
+
 	intern->num = NULL;
 	intern->value = NULL;
 	intern->scale = 1;
@@ -1022,7 +1021,7 @@ static zend_result bcmath_number_do_operation(uint8_t opcode, zval *ret_val, zva
 	ZVAL_OBJ(ret_val, &intern->std);
 
 	/* For increment and decrement, etc */
-	if (ret == SUCCESS && op1 == &op1_copy) {
+	if (op1 == &op1_copy) {
 		zval_ptr_dtor(op1);
 	}
 
@@ -1056,7 +1055,7 @@ static inline zend_string *bcmath_number_value_to_str(bcmath_number_obj_t *inter
 	return intern->value;
 }
 
-static HashTable *bcmath_number_get_properties(zend_object *obj, zend_prop_purpose purpose)
+static HashTable *bcmath_number_get_properties_for(zend_object *obj, zend_prop_purpose purpose)
 {
 	switch (purpose) {
 		case ZEND_PROP_PURPOSE_DEBUG:
@@ -1130,7 +1129,7 @@ static void bcmath_number_register_class(void)
 	bcmath_number_obj_handlers.do_operation = bcmath_number_do_operation;
 	bcmath_number_obj_handlers.compare = bcmath_number_compare;
 	bcmath_number_obj_handlers.read_property = bcmath_number_read_property;
-	bcmath_number_obj_handlers.get_properties_for = bcmath_number_get_properties;
+	bcmath_number_obj_handlers.get_properties_for = bcmath_number_get_properties_for;
 	bcmath_number_obj_handlers.cast_object = bcmath_number_cast_object;
 	bcmath_number_obj_handlers.get_gc = bcmath_number_get_gc;
 }

ext/bcmath/libbcmath/src/long2num.c

@@ -40,9 +40,9 @@ static inline size_t bc_count_len_in_vector(BC_VECTOR vector)
 	}
 
 	if (tmp >= 10) {
-		tmp += 2;
+		len += 2;
 	} else {
-		tmp += 1;
+		len += 1;
 	}
 
 	return len;
@@ -109,12 +109,12 @@ void bc_long2num(bc_num *num, zend_long lval)
 			end -= BC_VECTOR_SIZE;
 			bc_bulk_convert_vector_to_num(mid, end);
 			end -= BC_VECTOR_SIZE;
-			bc_convert_vector_to_num(low, ptr, end);
+			bc_convert_vector_to_num(high, ptr, end);
 			break;
 		case 2:
 			bc_bulk_convert_vector_to_num(low, end);
 			end -= BC_VECTOR_SIZE;
-			bc_convert_vector_to_num(low, ptr, end);
+			bc_convert_vector_to_num(mid, ptr, end);
 			break;
 		case 1:
 			bc_convert_vector_to_num(low, ptr, end);

ext/bcmath/php_bcmath.h

@@ -48,10 +48,10 @@ ZEND_EXTERN_MODULE_GLOBALS(bcmath)
 #define BC_MATH_NUMBER_MAX_EX_SCALE 10
 
 typedef struct _bcmath_number_obj_t {
-	zend_object std;
-	bc_num num;
-	size_t scale;
 	zend_string *value;
+	size_t scale;
+	bc_num num;
+	zend_object std;
 } bcmath_number_obj_t;
 
 typedef enum {