From e242f871df901d5a346eccb679d463c1d683d247 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Wed, 21 Jan 2015 11:39:23 -0800 Subject: [PATCH 1/2] Slightly modify and merge PR#105 from @MegaManSec --- sapi/fpm/fpm/fpm_conf.c | 2 ++ sapi/fpm/fpm/fpm_sockets.c | 1 + 2 files changed, 3 insertions(+) diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index cca4e1dbb8f..d812452e43c 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -574,6 +574,8 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve } else { kv->value = strdup(Z_STRVAL_P(value)); if (fpm_conf_expand_pool_name(&kv->value) == -1) { + free(kv->key); + free(kv); return "Can't use '$pool' when the pool is not defined"; } } diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index 065f63e7621..46ce1618442 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -297,6 +297,7 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /* if ((status = getaddrinfo(addr, port_str, &hints, &servinfo)) != 0) { zlog(ZLOG_ERROR, "getaddrinfo: %s\n", gai_strerror(status)); + free(dup_address); return -1; } From 251745c012a42ca131767d02d06ef373a790e115 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 22 Jan 2015 16:38:34 +0800 Subject: [PATCH 2/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;