From: Thies C. Arntzen <thies@php.net>
Date: Sat, 4 Dec 1999 13:18:08 +0000 (+0000)
Subject: the new SET_VAR_* macros forgot to set the refcount!
X-Git-Tag: PRE_RETURN_REF_PATCH~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=502bb337fe4b4df88dcc5531c62326ed49a08b2e;p=php

the new SET_VAR_* macros forgot to set the refcount!
---

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 876ca8cab4..4238522fad 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -197,8 +197,9 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_STRING(n,v)	{																				\
 								{																			\
-									zval *var = (zval *) emalloc(sizeof(zval));								\
+									zval *var;																\
 									char *str=(v); /* prevent 'v' from being evaluated more than once */	\
+									MAKE_STD_ZVAL(var);													\
 																											\
 									var->value.str.val = (str);												\
 									var->value.str.len = strlen((str));										\
@@ -209,7 +210,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_STRINGL(n,v,l)	{														\
 									{													\
-										zval *var = (zval *) emalloc(sizeof(zval));		\
+										zval *var;										\
+										MAKE_STD_ZVAL(var);								\
 																						\
 										var->value.str.val = (v);						\
 										var->value.str.len = (l);						\
@@ -220,7 +222,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_LONG(n,v)	{															\
 								{														\
-									zval *var = (zval *) emalloc(sizeof(zval));			\
+									zval *var;											\
+									MAKE_STD_ZVAL(var);									\
 																						\
 									var->value.lval = (v);								\
 									var->type = IS_LONG;								\
@@ -230,7 +233,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
 
 #define SET_VAR_DOUBLE(n,v)	{															\
 								{														\
-									zval *var = (zval *) emalloc(sizeof(zval));			\
+									zval *var;											\
+									MAKE_STD_ZVAL(var);									\
 																						\
 									var->value.dval = (v);								\
 									var->type = IS_DOUBLE;								\