archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed invalid pointer usage (tests/output/ob_start_callbacks.phpt)

Browse source
This commit is contained in:
Xinchen Hui 2014-03-07 16:49:01 +08:00
parent 7c623c0e89
commit c2933c234c
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main/output.c
View file

@ -495,8 +495,7 @@ PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler,
user = ecalloc(1, sizeof(php_output_handler_user_func_t));
if (SUCCESS == zend_fcall_info_init(output_handler, 0, &user->fci, &user->fcc, &handler_name, &error TSRMLS_CC)) {
handler = php_output_handler_init(handler_name->val, handler_name->len, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_USER TSRMLS_CC);
if (Z_REFCOUNTED_P(output_handler)) Z_ADDREF_P(output_handler);
user->zoh = output_handler;
ZVAL_COPY(&user->zoh, output_handler);
handler->func.user = user;
} else {
efree(user);
@ -709,7 +708,7 @@ PHPAPI void php_output_handler_dtor(php_output_handler *handler TSRMLS_DC)
//??? STR_FREE(handler->buffer.data);
if (handler->buffer.data) efree(handler->buffer.data);
if (handler->flags & PHP_OUTPUT_HANDLER_USER) {
zval_ptr_dtor(handler->func.user->zoh);
zval_ptr_dtor(&handler->func.user->zoh);
efree(handler->func.user);
}
if (handler->dtor && handler->opaq) {

2
main/php_output.h
View file

@ -123,7 +123,7 @@ typedef struct _php_output_handler *(*php_output_handler_alias_ctor_t)(const cha
typedef struct _php_output_handler_user_func_t {
zend_fcall_info fci;
zend_fcall_info_cache fcc;
zval *zoh;
zval zoh;
} php_output_handler_user_func_t;
typedef struct _php_output_handler {