archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use zval_ptr_dtor() instead of zval_dtor() in in-place array/object conversion functions

Browse source
This commit is contained in:
Dmitry Stogov 2018-07-06 12:07:13 +03:00
parent 6a4e1e8b8e
commit bd8e76761f
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/zend_operators.c
View file

@ -371,7 +371,7 @@ try_again:
zval dst; zval dst;
convert_object_to_type(op, &dst, IS_LONG, convert_to_long); convert_object_to_type(op, &dst, IS_LONG, convert_to_long);
zval_dtor(op); zval_ptr_dtor(op);
if (Z_TYPE(dst) == IS_LONG) { if (Z_TYPE(dst) == IS_LONG) {
ZVAL_LONG(op, Z_LVAL(dst)); ZVAL_LONG(op, Z_LVAL(dst));
@ -430,7 +430,7 @@ try_again:
zval dst; zval dst;
convert_object_to_type(op, &dst, IS_DOUBLE, convert_to_double); convert_object_to_type(op, &dst, IS_DOUBLE, convert_to_double);
zval_dtor(op); zval_ptr_dtor(op);
if (Z_TYPE(dst) == IS_DOUBLE) { if (Z_TYPE(dst) == IS_DOUBLE) {
ZVAL_DOUBLE(op, Z_DVAL(dst)); ZVAL_DOUBLE(op, Z_DVAL(dst));
@ -502,7 +502,7 @@ try_again:
zval dst; zval dst;
convert_object_to_type(op, &dst, _IS_BOOL, convert_to_boolean); convert_object_to_type(op, &dst, _IS_BOOL, convert_to_boolean);
zval_dtor(op); zval_ptr_dtor(op);
if (Z_TYPE_INFO(dst) == IS_FALSE || Z_TYPE_INFO(dst) == IS_TRUE) { if (Z_TYPE_INFO(dst) == IS_FALSE || Z_TYPE_INFO(dst) == IS_TRUE) {
Z_TYPE_INFO_P(op) = Z_TYPE_INFO(dst); Z_TYPE_INFO_P(op) = Z_TYPE_INFO(dst);
@ -576,7 +576,7 @@ try_again:
zval dst; zval dst;
convert_object_to_type(op, &dst, IS_STRING, convert_to_string); convert_object_to_type(op, &dst, IS_STRING, convert_to_string);
zval_dtor(op); zval_ptr_dtor(op);
if (Z_TYPE(dst) == IS_STRING) { if (Z_TYPE(dst) == IS_STRING) {
ZVAL_COPY_VALUE(op, &dst); ZVAL_COPY_VALUE(op, &dst);
@ -620,7 +620,7 @@ try_again:
(Z_OBJCE_P(op)->default_properties_count || (Z_OBJCE_P(op)->default_properties_count ||
Z_OBJ_P(op)->handlers != &std_object_handlers || Z_OBJ_P(op)->handlers != &std_object_handlers ||
GC_IS_RECURSIVE(obj_ht))); GC_IS_RECURSIVE(obj_ht)));
zval_dtor(op); zval_ptr_dtor(op);
ZVAL_ARR(op, obj_ht); ZVAL_ARR(op, obj_ht);
return; return;
} }
@ -629,13 +629,13 @@ try_again:
convert_object_to_type(op, &dst, IS_ARRAY, convert_to_array); convert_object_to_type(op, &dst, IS_ARRAY, convert_to_array);
if (Z_TYPE(dst) == IS_ARRAY) { if (Z_TYPE(dst) == IS_ARRAY) {
zval_dtor(op); zval_ptr_dtor(op);
ZVAL_COPY_VALUE(op, &dst); ZVAL_COPY_VALUE(op, &dst);
return; return;
} }
} }
zval_dtor(op); zval_ptr_dtor(op);
/*ZVAL_EMPTY_ARRAY(op);*/ /*ZVAL_EMPTY_ARRAY(op);*/
array_init(op); array_init(op);
} }
@ -667,7 +667,7 @@ try_again:
/* TODO: try not to duplicate immutable arrays as well ??? */ /* TODO: try not to duplicate immutable arrays as well ??? */
ht = zend_array_dup(ht); ht = zend_array_dup(ht);
} else if (ht != Z_ARR_P(op)) { } else if (ht != Z_ARR_P(op)) {
zval_dtor(op); zval_ptr_dtor(op);
} else { } else {
GC_DELREF(ht); GC_DELREF(ht);
} }