From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 2 Oct 2016 11:46:22 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC4~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f58cf8b24dc01d79a07035a794531bedc1b0b3f3;p=php

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

f58cf8b24dc01d79a07035a794531bedc1b0b3f3
diff --cc sapi/phpdbg/phpdbg.c
index 0e891f3869,618a72f429..5a1bd3a6b4
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@@ -2030,8 -2026,20 +2043,11 @@@ phpdbg_out
  			if (PHPDBG_G(prompt)[1]) {
  				free(PHPDBG_G(prompt)[1]);
  			}
+ 			if (PHPDBG_G(cur_command)) {
+ 				free(PHPDBG_G(cur_command));
+ 			}
  		}
  
 -		/* hack to restore mm_heap->use_custom_heap in order to receive memory leak info */
 -		if (use_mm_wrappers) {
 -			/* ASSUMING that mm_heap->use_custom_heap is the first element of the struct ... */
 -			*(int *) mm_heap = 0;
 -		}
 -		zend_try {
 -			php_request_shutdown(NULL);
 -		} zend_end_try();
 -
  		if (exit_status == 0) {
  			exit_status = EG(exit_status);
  		}