com php-src: Merge branch 'PHP-7.0' into PHP-7.1: sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_list.h
sapi/phpdbg/phpdbg_prompt.c

Commit: 728502fc2978dcf9286ac049a5dbfa74187c9746 Author: Bob Weinand <bobwei9@hotmail.com> Thu, 22 Dec 2016 00:40:54 +0100 Parents: ed0602fe311662e303c87cd63f190c609ee55923 3b2b080cbcdcadb97f9dd2db1a6e9e4200c34023 Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=728502fc2978dcf9286ac049a5dbfa74187c9746 Log: Merge branch 'PHP-7.0' into PHP-7.1 Changed paths: MM sapi/phpdbg/phpdbg.c MM sapi/phpdbg/phpdbg_list.c MM sapi/phpdbg/phpdbg_list.h MM sapi/phpdbg/phpdbg_prompt.c Diff: diff --cc sapi/phpdbg/phpdbg.c index ba13b93,8153772..96f1613 --- a/sapi/phpdbg/phpdbg..c +++ b/sapi/phpdbg/phpdbg.c @@@ -72,65 -76,6 +72,64 @@@ PHP_INI_END( static zend_bool phpdbg_booted = 0; static zend_bool phpdbg_fully_started = 0; +zend_bool use_mm_wrappers = 1; + +static void php_phpdbg_destroy_bp_file(zval *brake) /* {{{ */ +{ + zend_hash_destroy(Z_ARRVAL_P(brake)); + efree(Z_ARRVAL_P(brake)); +} /* }}} */ + +static void php_phpdbg_destroy_bp_symbol(zval *brake) /* {{{ */ +{ + efree((char *) ((phpdbg_breaksymbol_t *) Z_PTR_P(brake))->symbol); + efree(Z_PTR_P(brake)); +} /* }}} */ + +static void php_phpdbg_destroy_bp_opcode(zval *brake) /* {{{ */ +{ + efree((char *) ((phpdbg_breakop_t *) Z_PTR_P(brake))->name); + efree(Z_PTR_P(brake)); +} /* }}} */ + +static void php_phpdbg_destroy_bp_opline(zval *brake) /* {{{ */ +{ + efree(Z_PTR_P(brake)); +} /* }}} */ + +static void php_phpdbg_destroy_bp_methods(zval *brake) /* {{{ */ +{ + zend_hash_destroy(Z_ARRVAL_P(brake)); + efree(Z_ARRVAL_P(brake)); +} /* }}} */ + +static void php_phpdbg_destroy_bp_condition(zval *data) /* {{{ */ +{ + phpdbg_breakcond_t *brake = (phpdbg_breakcond_t *) Z_PTR_P(data); + + if (brake->ops) { + destroy_op_array(brake->ops); + efree(brake->ops); + } + efree((char*) brake->code); + efree(brake); +} /* }}} */ + +static void php_phpdbg_destroy_registered(zval *data) /* {{{ */ +{ + zend_function *function = (zend_function *) Z_PTR_P(data); + destroy_zend_function(function); +} /* }}} */ + +static void php_phpdbg_destroy_file_source(zval *data) /* {{{ */ +{ + phpdbg_file_source *source = (phpdbg_file_source *) Z_PTR_P(data); + destroy_op_array(&source->op_array); + if (source->buf) { + efree(source->buf); + } - efree(source->filename); + efree(source); +} /* }}} */ static inline void php_phpdbg_globals_ctor(zend_phpdbg_globals *pg) /* {{{ */ {