mirror of
https://github.com/php/php-src.git
synced 2025-01-19 10:13:38 +08:00
- Previous patch for too early freeing of resources seemed to have worked.
- Clean it up a bit.
This commit is contained in:
parent
b11202d66b
commit
27fd3a2e57
@ -167,12 +167,7 @@ ZEND_API void convert_scalar_to_number(zval *op)
|
||||
break; \
|
||||
} \
|
||||
case IS_BOOL: \
|
||||
(holder).value.lval = (op)->value.lval; \
|
||||
(holder).type = IS_LONG; \
|
||||
(op) = &(holder); \
|
||||
break; \
|
||||
case IS_RESOURCE: \
|
||||
/*zend_list_delete((op)->value.lval);*/ \
|
||||
(holder).value.lval = (op)->value.lval; \
|
||||
(holder).type = IS_LONG; \
|
||||
(op) = &(holder); \
|
||||
@ -207,11 +202,8 @@ ZEND_API void convert_scalar_to_number(zval *op)
|
||||
case IS_OBJECT: \
|
||||
(holder).value.lval = (zend_hash_num_elements((op)->value.obj.properties)?1:0); \
|
||||
break; \
|
||||
case IS_RESOURCE: \
|
||||
/*zend_list_delete((op)->value.lval);*/ \
|
||||
(holder).value.lval = (op)->value.lval; \
|
||||
break; \
|
||||
case IS_BOOL: \
|
||||
case IS_RESOURCE: \
|
||||
(holder).value.lval = (op)->value.lval; \
|
||||
break; \
|
||||
default: \
|
||||
@ -233,8 +225,6 @@ ZEND_API void convert_scalar_to_number(zval *op)
|
||||
(holder).value.lval = 0; \
|
||||
break; \
|
||||
case IS_RESOURCE: \
|
||||
/*zend_list_delete((op)->value.lval);*/ \
|
||||
/* break missing intentionally */ \
|
||||
case IS_LONG: \
|
||||
(holder).value.lval = ((op)->value.lval ? 1 : 0); \
|
||||
break; \
|
||||
|
Loading…
Reference in New Issue
Block a user