From 1ce4e8c45ede395db9b3c2d157dbeb29a28830c5 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Mon, 13 Jul 2015 19:38:55 -0700 Subject: [PATCH] Fix potential segfault --- Zend/zend_list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 261489b4a1..c2cd606074 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -102,11 +102,11 @@ ZEND_API zend_resource* zend_register_resource(void *rsrc_pointer, int rsrc_type ZEND_API void *zend_fetch_resource2(zend_resource *res, const char *resource_type_name, int resource_type1, int resource_type2) { - if (resource_type1 == res->type) { + if (res && resource_type1 == res->type) { return res->ptr; } - if (resource_type2 == res->type) { + if (res && resource_type2 == res->type) { return res->ptr; } -- 2.50.1