diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-03-06 03:31:06 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-03-06 03:31:06 +0300 |
| commit | c060d88c3652e771628b1c14a3fe87d99e3122a4 (patch) | |
| tree | 233f4bb02cc3c4b9d3e358dd4237568bec6cec7f | |
| parent | 44e1d2f8a990ecb0dd12c9ee69f8b6ea1d2914be (diff) | |
| download | php-git-c060d88c3652e771628b1c14a3fe87d99e3122a4.tar.gz | |
Fixed bug #76050
| -rw-r--r-- | Zend/zend_gc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 530268b7ae..b3c1fc9f12 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -419,7 +419,8 @@ ZEND_API zend_bool gc_enable(zend_bool enable) zend_bool old_enabled = GC_G(gc_enabled); GC_G(gc_enabled) = enable; if (enable && !old_enabled && GC_G(buf) == NULL) { - GC_G(buf) = (gc_root_buffer*) malloc(sizeof(gc_root_buffer) * GC_DEFAULT_BUF_SIZE); + GC_G(buf) = (gc_root_buffer*) pemalloc(sizeof(gc_root_buffer) * GC_DEFAULT_BUF_SIZE, 1); + GC_G(buf)[0].ref = NULL; GC_G(buf_size) = GC_DEFAULT_BUF_SIZE; GC_G(gc_threshold) = GC_THRESHOLD_DEFAULT + GC_FIRST_ROOT; gc_reset(); @@ -590,8 +591,6 @@ ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref) gc_root_buffer *root; uint32_t idx = GC_REF_ADDRESS(ref); - ZEND_ASSERT(idx); - GC_BENCH_INC(zval_remove_from_buffer); if (!GC_REF_CHECK_COLOR(ref, GC_BLACK)) { @@ -605,6 +604,7 @@ ZEND_API void ZEND_FASTCALL gc_remove_from_buffer(zend_refcounted *ref) return; } + ZEND_ASSERT(idx); root = GC_IDX2PTR(idx); gc_remove_from_roots(root); } |