From 248ebf0df69f61f5538df44d3565893935b784c5 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 27 Jul 2015 16:56:54 +0200 Subject: [PATCH] Fix: A buf == NULL on filehandle will segfault --- sapi/phpdbg/phpdbg_list.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index 3d64c8b0770..89e352a9714 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;