]> granicus.if.org Git - php/commitdiff
Add check for null pointer, as done in case 5 lines above.
authorJoshua Rogers <git@internot.info>
Fri, 30 Jan 2015 02:30:17 +0000 (13:30 +1100)
committerJoshua Rogers <git@internot.info>
Fri, 30 Jan 2015 02:30:17 +0000 (13:30 +1100)
Zend/zend_inheritance.c

index d02e1ab42c293ce173688720df843660eb5bf32a..10b0ae5e844b9a02ad11f3e4dbea968cadff7c3e 100644 (file)
@@ -404,7 +404,7 @@ static void zend_append_type_hint(smart_str *str, zend_function *fptr, zend_arg_
                if (!strcasecmp(class_name, "self") && fptr->common.scope) {
                        class_name = fptr->common.scope->name->val;
                        class_name_len = fptr->common.scope->name->len;
-               } else if (!strcasecmp(class_name, "parent") && fptr->common.scope->parent) {
+               } else if (!strcasecmp(class_name, "parent") && fptr->common.scope && fptr->common.scope->parent) {
                        class_name = fptr->common.scope->parent->name->val;
                        class_name_len = fptr->common.scope->parent->name->len;
                }