@@ -197,8 +197,9 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
197
197
198
198
#define SET_VAR_STRING (n ,v ) { \
199
199
{ \
200
- zval *var = (zval *) emalloc(sizeof(zval)); \
200
+ zval *var; \
201
201
char *str=(v); /* prevent 'v' from being evaluated more than once */ \
202
+ MAKE_STD_ZVAL (var ); \
202
203
\
203
204
var -> value .str .val = (str ); \
204
205
var -> value .str .len = strlen ((str )); \
@@ -209,7 +210,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
209
210
210
211
#define SET_VAR_STRINGL (n ,v ,l ) { \
211
212
{ \
212
- zval *var = (zval *) emalloc(sizeof(zval)); \
213
+ zval *var; \
214
+ MAKE_STD_ZVAL(var); \
213
215
\
214
216
var->value.str.val = (v); \
215
217
var->value.str.len = (l); \
@@ -220,7 +222,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
220
222
221
223
#define SET_VAR_LONG (n ,v ) { \
222
224
{ \
223
- zval *var = (zval *) emalloc(sizeof(zval)); \
225
+ zval *var; \
226
+ MAKE_STD_ZVAL(var); \
224
227
\
225
228
var->value.lval = (v); \
226
229
var->type = IS_LONG; \
@@ -230,7 +233,8 @@ ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length,
230
233
231
234
#define SET_VAR_DOUBLE (n ,v ) { \
232
235
{ \
233
- zval *var = (zval *) emalloc(sizeof(zval)); \
236
+ zval *var; \
237
+ MAKE_STD_ZVAL(var); \
234
238
\
235
239
var->value.dval = (v); \
236
240
var->type = IS_DOUBLE; \
0 commit comments