From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 21 Dec 2016 23:40:54 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=728502fc2978dcf9286ac049a5dbfa74187c9746;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

728502fc2978dcf9286ac049a5dbfa74187c9746
diff --cc sapi/phpdbg/phpdbg.c
index ba13b93646,8153772368..96f1613a59
--- 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) /* {{{ */
  {