From b20953118ba41cd9465ccc84e79b6eef3f539573 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 3 Aug 2015 20:49:41 +0200
Subject: Fix last invalid read Also revert debugging run-tests.php changes...

---
 sapi/phpdbg/phpdbg_list.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sapi/phpdbg/phpdbg_list.c')

diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index 89e352a971..8369018fc9 100644
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -244,11 +244,11 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
 		return NULL;
 	}
 
-	data.buf = emalloc(data.len + 1);
+	data.buf = emalloc(data.len + ZEND_MMAP_AHEAD + 1);
 	if (data.len > 0) {
 		memcpy(data.buf, bufptr, data.len);
 	}
-	data.buf[data.len] = 0;
+	memset(data.buf + data.len, 0, ZEND_MMAP_AHEAD + 1);
 	data.filename = filename;
 	data.line[0] = 0;
 
-- 
cgit v1.2.1