Fix crash on Solaris with function parameter destruction

diff --git a/Zend/zend_execute_locks.h b/Zend/zend_execute_locks.h
index c37a3a3e46dfb860202b3e44e46ff48ff9d75a9f..0be06b0ac487914c094834f90eb39aed4443c9a7 100644 (file)
--- a/Zend/zend_execute_locks.h
+++ b/Zend/zend_execute_locks.h
@@ -6,7 +6,6 @@
                                                        if (!(z)->refcount) {                                                   \
                                                                (z)->refcount = 1;                                                      \
                                                                (z)->is_ref = 0;                                                        \
-                                                               EG(garbage)[EG(garbage_ptr)++] = (z);           \
                                                                if (EG(garbage_ptr) == 4) {                                     \
                                                                        zval_ptr_dtor(&EG(garbage)[0]);                 \
                                                                        zval_ptr_dtor(&EG(garbage)[1]);                 \
@@ -14,6 +13,7 @@
                                                                        EG(garbage)[1] = EG(garbage)[3];                \
                                                                        EG(garbage_ptr) -= 2;                                   \
                                                                }                                                                                       \
+                                                               EG(garbage)[EG(garbage_ptr)++] = (z);           \
                                                        }                                                                                               \
                                                }