Fixed Bug #53958 (Closures can't 'use' shared variables by value and by reference)

diff --git a/NEWS b/NEWS
index 72c83eae115fd23ed9fde2af1cb04e2533ee9987..43be363d3616f9bc6ae8a44644da067e11cc4a11 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@
   . Added options to debug backtrace functions. (Stas)
   . Fixed Bug #53971 (isset() and empty() produce apparently spurious runtime
     error). (Dmitry)
+  . Fixed Bug #53958 (Closures can't 'use' shared variables by value and by
+    reference). (Dmitry)
   . Fixed Bug #53629 (memory leak inside highlight_string()). (Hannes, Ilia)
   . Fixed Bug #51458 (Lack of error context with nested exceptions). (Stas)
   . Fixed Bug #47143 (Throwing an exception in a destructor causes a fatal

diff --git a/Zend/tests/bug53958.phpt b/Zend/tests/bug53958.phpt
new file mode 100644 (file)
index 0000000..96a4115
--- /dev/null
+++ b/Zend/tests/bug53958.phpt
@@ -0,0 +1,61 @@
+--TEST--
+Bug #53958 (Closures can't 'use' shared variables by value and by reference)
+--FILE--
+<?php
+// TEST 1
+$a = 1;
+$fn1 = function() use ($a) {echo "$a\n"; $a++;};
+$fn2 = function() use ($a) {echo "$a\n"; $a++;};
+$a = 5;
+$fn1(); // 1
+$fn2(); // 1
+$fn1(); // 1
+$fn2(); // 1
+
+// TEST 2
+$b = 1;
+$fn1 = function() use (&$b) {echo "$b\n"; $b++;};
+$fn2 = function() use (&$b) {echo "$b\n"; $b++;};
+$b = 5;
+$fn1(); // 5
+$fn2(); // 6
+$fn1(); // 7
+$fn2(); // 8
+
+// TEST 3
+$c = 1;
+$fn1 = function() use (&$c) {echo "$c\n"; $c++;};
+$fn2 = function() use ($c) {echo "$c\n"; $c++;};
+$c = 5;
+$fn1(); // 5
+$fn2(); // 1
+$fn1(); // 6
+$fn2(); // 1
+
+// TEST 4
+$d = 1;
+$fn1 = function() use ($d) {echo "$d\n"; $d++;};
+$fn2 = function() use (&$d) {echo "$d\n"; $d++;};
+$d = 5;
+$fn1(); // 1
+$fn2(); // 5
+$fn1(); // 1
+$fn2(); // 6
+?>
+--EXPECT--
+1
+1
+1
+1
+5
+6
+7
+8
+5
+1
+6
+1
+1
+5
+1
+6

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 5d34a05c13ab53d468367aa4e798f85b4a0cd68d..d460416e6cea018b1838d3caa563c0ff4d19389f 100644 (file)
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -323,6 +323,7 @@ static int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args,
 {
        HashTable *target = va_arg(args, HashTable*);
        zend_bool is_ref;
+       zval *tmp;
 
        if (Z_TYPE_PP(p) & (IS_LEXICAL_VAR|IS_LEXICAL_REF)) {
                is_ref = Z_TYPE_PP(p) & IS_LEXICAL_REF;
@@ -332,25 +333,31 @@ static int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args,
                }
                if (zend_hash_quick_find(EG(active_symbol_table), key->arKey, key->nKeyLength, key->h, (void **) &p) == FAILURE) {
                        if (is_ref) {
-                               zval *tmp;
-
                                ALLOC_INIT_ZVAL(tmp);
                                Z_SET_ISREF_P(tmp);
                                zend_hash_quick_add(EG(active_symbol_table), key->arKey, key->nKeyLength, key->h, &tmp, sizeof(zval*), (void**)&p);
                        } else {
-                               p = &EG(uninitialized_zval_ptr);
+                               tmp = EG(uninitialized_zval_ptr);
                                zend_error(E_NOTICE,"Undefined variable: %s", key->arKey);
                        }
                } else {
                        if (is_ref) {
                                SEPARATE_ZVAL_TO_MAKE_IS_REF(p);
+                               tmp = *p;
                        } else if (Z_ISREF_PP(p)) {
-                               SEPARATE_ZVAL(p);
+                               ALLOC_INIT_ZVAL(tmp);
+                               *tmp = **p;
+                               Z_SET_REFCOUNT_P(tmp, 0);
+                               Z_UNSET_ISREF_P(tmp);
+                       } else {
+                               tmp = *p;
                        }
                }
+       } else {
+               tmp = *p;
        }
-       if (zend_hash_quick_add(target, key->arKey, key->nKeyLength, key->h, p, sizeof(zval*), NULL) == SUCCESS) {
-               Z_ADDREF_PP(p);
+       if (zend_hash_quick_add(target, key->arKey, key->nKeyLength, key->h, &tmp, sizeof(zval*), NULL) == SUCCESS) {
+               Z_ADDREF_P(tmp);
        }
        return ZEND_HASH_APPLY_KEEP;
 }