From 27fd3a2e57a42b28208e1355c46e23ad04764621 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sun, 29 Apr 2001 09:21:38 +0000 Subject: [PATCH] - Previous patch for too early freeing of resources seemed to have worked. - Clean it up a bit. --- Zend/zend_operators.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index c772d04d753..713177c3804 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -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; \