]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 10:17:47 +0000 (12:17 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 13 Aug 2019 10:17:47 +0000 (12:17 +0200)
1  2 
Zend/zend_gc.c

diff --cc Zend/zend_gc.c
index 5209b9c69c2e4e8d65438fdf9183076afe3d8c2d,e1c2295d740b61dc7a95d8847a184506ec9049ad..1064e69d6e6e70efe3d751e9c0c5c05d09b73a9b
@@@ -1357,13 -1354,15 +1346,13 @@@ tail_call
                        if (EXPECTED(!(OBJ_FLAGS(ref) & IS_OBJ_FREE_CALLED))) {
                                int n;
                                zval *zv, *end;
 -                              zval tmp;
  
 -                              ZVAL_OBJ(&tmp, obj);
 -                              ht = obj->handlers->get_gc(&tmp, &zv, &n);
 +                              ht = obj->handlers->get_gc(obj, &zv, &n);
                                end = zv + n;
                                if (EXPECTED(!ht)) {
-                                       if (!n) return;
+                                       if (!n) return count;
                                        while (!Z_REFCOUNTED_P(--end)) {
-                                               if (zv == end) return;
+                                               if (zv == end) return count;
                                        }
                                }
                                while (zv != end) {