From 44d0c1d32c01476ccb5edefcf4d5cdaa46b8e5e6 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 16 Sep 2005 16:21:51 +0000 Subject: [PATCH] - fix memory corruption - ditch unused macro --- php_http_std_defs.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/php_http_std_defs.h b/php_http_std_defs.h index a2b753f..c212d30 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -256,9 +256,7 @@ typedef int STATUS; { \ zval *__tmp = GET_PROP(o, p); \ if (__tmp) { \ - zval_dtor(__tmp); \ - FREE_ZVAL(__tmp); \ - __tmp = NULL; \ + zval_ptr_dtor(&__tmp); \ } \ } @@ -339,18 +337,13 @@ typedef int STATUS; ZEND_ARG_PASS_INFO(0) \ ZEND_ARG_PASS_INFO(0) \ ZEND_ARG_PASS_INFO(1) \ - ZEND_END_ARG_INFO(); \ - \ - static \ - ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_all, 1) \ - ZEND_ARG_PASS_INFO(1) \ - ZEND_END_ARG_INFO() + ZEND_END_ARG_INFO(); + # else # define HTTP_DECLARE_ARG_PASS_INFO() \ static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ - static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ - static unsigned char http_arg_pass_ref_all[]={1, BYREF_FORCE_REST} + static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; # endif /* ZEND_ENGINE_2 */ #else # define HTTP_DECLARE_ARG_PASS_INFO() -- 2.30.2