From 5c56fd4793262c81cfffcc2a5eebc21477160959 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Wed, 22 Dec 1999 15:34:38 +0000 Subject: [PATCH] Fix for the array() initialization bug Stas found --- Zend/zend_execute.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f109ea1217e..cd4a287c434 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1850,12 +1850,14 @@ send_by_ref: zval *expr_ptr, **expr_ptr_ptr = NULL; zval *offset=get_zval_ptr(&opline->op2, Ts, &EG(free_op2), BP_VAR_R); + SUSPEND_GARBAGE(); if (opline->extended_value) { expr_ptr_ptr=get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_R); expr_ptr = *expr_ptr_ptr; } else { expr_ptr=get_zval_ptr(&opline->op1, Ts, &EG(free_op1), BP_VAR_R); } + RESUME_GARBAGE(); if (opline->opcode==ZEND_INIT_ARRAY) { array_init(array_ptr);