diff options
author | Toon Schoenmakers <toon.schoenmakers@copernica.com> | 2014-11-21 16:37:08 +0100 |
---|---|---|
committer | Toon Schoenmakers <toon.schoenmakers@copernica.com> | 2014-11-21 16:37:08 +0100 |
commit | 945748c19b966fff297d9a7a1e2dfda3b0a80754 (patch) | |
tree | e1ec0249d0df7aee2f22b11e484a948fae2b0092 /zend/value.cpp | |
parent | 578fc01d0e6ba0be7818ad2d2533aa3a2dde3ba4 (diff) |
Value::refcount() is now const, and fixed a memory leak in return values
Diffstat (limited to 'zend/value.cpp')
-rw-r--r-- | zend/value.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/zend/value.cpp b/zend/value.cpp index b28096a..946a41d 100644 --- a/zend/value.cpp +++ b/zend/value.cpp @@ -303,13 +303,7 @@ Value::~Value() // if there were two references or less, we're going to remove a reference // and only one reference will remain, the object will then impossible be // a reference - // - // This initially seemed to be a good idea, because reference-variables - // are hard to deal with, and a reference with only one or even zero variables - // pointing towards it seem silly, but this line of code caused objects only - // to be destructed when the script exits - // - // if (Z_REFCOUNT_P(_val) <= 2) Z_UNSET_ISREF_P(_val); + if (Z_REFCOUNT_P(_val) <= 2) Z_UNSET_ISREF_P(_val); // destruct the zval (this function will decrement the reference counter, // and only destruct if there are no other references left) @@ -393,7 +387,7 @@ void Value::attach(struct _hashtable *hashtable) * Retrieve the refcount * @return int */ -int Value::refcount() +int Value::refcount() const { return Z_REFCOUNT_P(_val); } |