Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Improove debug capabilities

  • Loading branch information...
commit 3df0288490837f8916b41235729d1118f16a7f03 1 parent b0620b2
Marcus Boerger authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 Zend/zend_execute.h
  2. +1 −1  Zend/zend_execute_API.c
View
5 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);
View
2  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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.