From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 27 Jul 2015 14:56:54 +0000 (+0200)
Subject: Fix: A buf == NULL on filehandle will segfault
X-Git-Tag: php-7.0.0beta3~5^2~88^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=248ebf0df69f61f5538df44d3565893935b784c5;p=php

Fix: A buf == NULL on filehandle will segfault
---

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