summaryrefslogtreecommitdiff
path: root/main/output.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-05-28 16:27:12 +0300
committerDmitry Stogov <dmitry@zend.com>2018-05-28 16:27:12 +0300
commit5eb1f92f31cafc48384f9096012f421b37f6d425 (patch)
tree4ed67b92229407e7b5cbab37b96428fe80eb3f94 /main/output.c
parent925f05dd1a35eafa71eb29abb69cdfc31a23a75d (diff)
downloadphp-git-5eb1f92f31cafc48384f9096012f421b37f6d425.tar.gz
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
Diffstat (limited to 'main/output.c')
-rw-r--r--main/output.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/main/output.c b/main/output.c
index 74bc552dc6..63850a7cd6 100644
--- a/main/output.c
+++ b/main/output.c
@@ -504,7 +504,7 @@ PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler,
efree(error);
}
if (handler_name) {
- zend_string_release(handler_name);
+ zend_string_release_ex(handler_name, 0);
}
}
@@ -521,7 +521,7 @@ PHPAPI php_output_handler *php_output_handler_create_internal(const char *name,
handler = php_output_handler_init(str, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_INTERNAL);
handler->func.internal = output_handler;
- zend_string_release(str);
+ zend_string_release_ex(str, 0);
return handler;
}
@@ -618,7 +618,7 @@ PHPAPI int php_output_handler_conflict_register(const char *name, size_t name_le
}
str = zend_string_init_interned(name, name_len, 1);
ret = zend_hash_update_ptr(&php_output_handler_conflicts, str, check_func) ? SUCCESS : FAILURE;
- zend_string_release(str);
+ zend_string_release_ex(str, 1);
return ret;
}
/* }}} */
@@ -647,7 +647,7 @@ PHPAPI int php_output_handler_reverse_conflict_register(const char *name, size_t
}
str = zend_string_init_interned(name, name_len, 1);
ret = zend_hash_update_mem(&php_output_handler_reverse_conflicts, str, &rev, sizeof(HashTable)) ? SUCCESS : FAILURE;
- zend_string_release(str);
+ zend_string_release_ex(str, 1);
if (ret != SUCCESS) {
zend_hash_destroy(&rev);
}
@@ -677,7 +677,7 @@ PHPAPI int php_output_handler_alias_register(const char *name, size_t name_len,
}
str = zend_string_init_interned(name, name_len, 1);
ret = zend_hash_update_ptr(&php_output_handler_aliases, str, func) ? SUCCESS : FAILURE;
- zend_string_release(str);
+ zend_string_release_ex(str, 1);
return ret;
}
/* }}} */
@@ -716,7 +716,7 @@ PHPAPI int php_output_handler_hook(php_output_handler_hook_t type, void *arg)
PHPAPI void php_output_handler_dtor(php_output_handler *handler)
{
if (handler->name) {
- zend_string_release(handler->name);
+ zend_string_release_ex(handler->name, 0);
}
if (handler->buffer.data) {
efree(handler->buffer.data);