From 3df0288490837f8916b41235729d1118f16a7f03 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 18 Jan 2004 23:47:10 +0000 Subject: [PATCH] Improove debug capabilities --- Zend/zend_execute.h | 5 +++-- Zend/zend_execute_API.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 153218204c..165f374f83 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -51,12 +51,13 @@ void shutdown_executor(TSRMLS_D); ZEND_API void execute(zend_op_array *op_array TSRMLS_DC); ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC); ZEND_API int zend_is_true(zval *op); -static inline void safe_free_zval_ptr(zval *p) +#define safe_free_zval_ptr(p) safe_free_zval_ptr_rel(p ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) +static inline void safe_free_zval_ptr_rel(zval *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { TSRMLS_FETCH(); if (p!=EG(uninitialized_zval_ptr)) { - FREE_ZVAL(p); + FREE_ZVAL_REL(p); } } ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 127708b4fc..52f0d9e3ef 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -357,7 +357,7 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC) (*zval_ptr)->refcount--; if ((*zval_ptr)->refcount==0) { zval_dtor(*zval_ptr); - safe_free_zval_ptr(*zval_ptr); + safe_free_zval_ptr_rel(*zval_ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC); } else if ((*zval_ptr)->refcount == 1) { (*zval_ptr)->is_ref = 0; } -- 2.40.0