com php-src: Fixed segfault due to missing REFCOUNTED check: Zend/zend.h Zend/zend_API.c

From: Date: Fri, 21 Feb 2014 13:12:12 +0000
Subject: com php-src: Fixed segfault due to missing REFCOUNTED check: Zend/zend.h Zend/zend_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78029@lists.php.net to get a copy of this message
Commit: 2b7ca1c7560a4e2d5d527ba429e0a5fa306624c6 Author: Xinchen Hui <laruence@gmail.com> Fri, 21 Feb 2014 21:12:12 +0800 Parents: f4f7a80a2cd657af0615dab01c685cb909f1cbd7 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b7ca1c7560a4e2d5d527ba429e0a5fa306624c6 Log: Fixed segfault due to missing REFCOUNTED check Changed paths: M Zend/zend.h M Zend/zend_API.c Diff: diff --git a/Zend/zend.h b/Zend/zend.h index 44266c2..b62a022 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -733,11 +733,11 @@ END_EXTERN_C() Z_SET_REFCOUNT_PP(ppzv_dest, refcount); \ } -#define SEPARATE_ARG_IF_REF(varptr) \ - if (Z_ISREF_P(varptr)) { \ - ZVAL_DUP(varptr, Z_REFVAL_P(varptr)); \ - } else { \ - Z_ADDREF_P(varptr); \ +#define SEPARATE_ARG_IF_REF(varptr) \ + if (Z_ISREF_P(varptr)) { \ + ZVAL_DUP(varptr, Z_REFVAL_P(varptr)); \ + } else if (IS_REFCOUNTED(Z_TYPE_P(varptr))) { \ + Z_ADDREF_P(varptr); \ } #define READY_TO_DESTROY(zv) \ diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e2737a2..f1ba871 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -176,7 +176,9 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array TS while (param_count-->0) { zval *param = p-(arg_count--); - Z_ADDREF_P(param); + if (Z_REFCOUNTED_P(param)) { + Z_ADDREF_P(param); + } add_next_index_zval(argument_array, param); }

« previous php.cvs (#78029) next »