summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>1999-10-06 17:45:15 +0000
committerAndi Gutmans <andi@php.net>1999-10-06 17:45:15 +0000
commite3d0c91dbbbaedce2cff7a43ab4e9bc3accfc669 (patch)
treee3865aa9a22a20de74b768457ac030ea63ca8611
parent8959144837bd27f519e4eb657d1bd79a2aea7d08 (diff)
downloadphp-git-e3d0c91dbbbaedce2cff7a43ab4e9bc3accfc669.tar.gz
- Fixed memory leak with this pointer. It was somtimes initialized with refcount
of 2 instead of 1. - Also fixed a place where object.ptr_ptr is set to pointing to a zval* instead of zval**. I don't think this is ever used so we might be able to remove it altogether.
-rw-r--r--Zend/zend_execute.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6133ac6bab..204a8b1f95 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1492,9 +1492,9 @@ do_fcall_common:
*tmp = *object.ptr;
zendi_zval_copy_ctor(*tmp);
object.ptr = tmp;
- *object.ptr_ptr = tmp;
+ object.ptr_ptr = &tmp;
}
- object.ptr->refcount = 1;
+ object.ptr->refcount = 0;
object.ptr->is_ref = 1;
}
*this_ptr = object.ptr;