diff options
| author | Joshua Rogers <git@internot.info> | 2015-01-30 13:30:17 +1100 |
|---|---|---|
| committer | Joshua Rogers <git@internot.info> | 2015-01-30 13:30:17 +1100 |
| commit | 26d5ad6c9803d2243c75cdeff3d471d67f531358 (patch) | |
| tree | fb09320d2cdb6564a35b134cb0094b6a1144c7c0 /Zend/zend_inheritance.c | |
| parent | 2505aea1535ad2dfd9254939c9c1bbde3085e125 (diff) | |
| download | php-git-26d5ad6c9803d2243c75cdeff3d471d67f531358.tar.gz | |
Add check for null pointer, as done in case 5 lines above.
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index d02e1ab42c..10b0ae5e84 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -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; } |