From 251745c012a42ca131767d02d06ef373a790e115 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 22 Jan 2015 16:38:34 +0800 Subject: [PATCH 1/2] Fixed segfault while running with moodle --- ext/opcache/Optimizer/block_pass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 79eee8bcc14..bbdddec7504 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -381,7 +381,7 @@ static inline void del_source(zend_code_block *from, zend_code_block *to) return; } - if (to->sources->next == NULL) { + if (!to->protected && to->sources->next == NULL) { /* source to only one block */ zend_code_block *from_block = to->sources->from; From 91aa340180eccfc15d4a143b54d47b8120f898be Mon Sep 17 00:00:00 2001 From: Joshua Rogers Date: Thu, 22 Jan 2015 09:59:13 +0100 Subject: [PATCH 2/2] Fixed bug #68827 Double free with disabled ZMM --- NEWS | 3 +++ ext/fileinfo/libmagic/apprentice.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index cd5b4d7f4d8..5d8a1f99e86 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ PHP NEWS - Dba: . Fixed bug #68711 (useless comparisons). (bugreports at internot dot info) +- Fileinfo: + . Fixed bug #68827 (Double free with disabled ZMM). (Joshua Rogers) + - OpenSSL: . Fixed bug #55618 (use case-insensitive cert name matching). (Daniel Lowrey) diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index b137405da22..1cbe0fce5e1 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -2603,8 +2603,7 @@ apprentice_map(struct magic_set *ms, const char *fn) if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) { file_oomem(ms, sizeof(*map)); - efree(map); - goto error; + return NULL; } if (fn == NULL) {