]> granicus.if.org Git - php/commitdiff
Fix potential segfault
authorRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 14 Jul 2015 02:38:55 +0000 (19:38 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Tue, 14 Jul 2015 02:38:55 +0000 (19:38 -0700)
Zend/zend_list.c

index 261489b4a17072b1efff64300e4f0cb6ec1ecdf1..c2cd606074f34b367092c9d85a944604604b1103 100644 (file)
@@ -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;
        }