diff options
| author | Zeev Suraski <zeev@php.net> | 2004-02-15 12:58:19 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-02-15 12:58:19 +0000 |
| commit | 7c710a9f9bb65f90d35bdb88d2bc70df1f03b81c (patch) | |
| tree | fd700bd09f894c07b111c8b7f50c8d6f59da1ef8 /ext | |
| parent | a2e1844de9d2584769fbd4a06e7b67e418919198 (diff) | |
| download | php-git-7c710a9f9bb65f90d35bdb88d2bc70df1f03b81c.tar.gz | |
Use zval_ptr_dtor() to free variables as soon as they hit refcount of 0.
Note: You should not be using ZVAL_DELREF() in day to day usage. Instead,
you should use zval_ptr_dtor(). Use ZVAL_DELREF() only if you're
messing with the refcount directly and know what you're doing.
Note #2: For clarity, if you want to initialize a new zval with a refcount
of 0, it's best to do that directly, instead of using ZVAL_DELREF
after allocating the zval...
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/com_dotnet/com_saproxy.c | 4 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 | ||||
| -rw-r--r-- | ext/session/session.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 2dbde1415d..78e9f622ed 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -265,7 +265,7 @@ static void saproxy_free_storage(void *object TSRMLS_DC) { php_com_saproxy *proxy = (php_com_saproxy *)object; - ZVAL_DELREF(proxy->zobj); + zval_ptr_dtor(&proxy->zobj); efree(proxy->indices); efree(proxy); } @@ -325,7 +325,7 @@ static void saproxy_iter_dtor(zend_object_iterator *iter TSRMLS_DC) { php_com_saproxy_iter *I = (php_com_saproxy_iter*)iter->data; - ZVAL_DELREF(I->proxy_obj); + zval_ptr_dtor(&I->proxy_obj); efree(I->indices); efree(I); diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 7545b69f3f..148337ea4b 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -466,7 +466,7 @@ PHP_FUNCTION(libxml_set_streams_context) return; } if (LIBXML(stream_context)) { - ZVAL_DELREF(LIBXML(stream_context)); + zval_ptr_dtor(&LIBXML(stream_context)); LIBXML(stream_context) = NULL; } ZVAL_ADDREF(arg); diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 9bf75d9bbb..4befc71e64 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -70,7 +70,7 @@ void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type) } } if (bbuf.vars[i]) { - ZVAL_DELREF(bbuf.vars[i]); + zval_ptr_dtor(&bbuf.vars[i]); } } diff --git a/ext/session/session.c b/ext/session/session.c index dcb45d0e81..27874f72ee 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -281,7 +281,7 @@ void php_add_session_var(char *name, size_t namelen TSRMLS_DC) zval *empty_var; ALLOC_INIT_ZVAL(empty_var); /* this sets refcount to 1 */ - ZVAL_DELREF(empty_var); /* our module does not maintain a ref */ + empty_var->refcount = 0; /* our module does not maintain a ref */ /* The next call will increase refcount by NR_OF_SYM_TABLES==2 */ zend_set_hash_symbol(empty_var, name, namelen, 1, 2, Z_ARRVAL_P(PS(http_session_vars)), &EG(symbol_table)); } else if (sym_global == NULL) { |