diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:30:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-22 18:30:56 -0700 |
| commit | 723ffe2e896f3546b666ba1b1ee677c404a8cf45 (patch) | |
| tree | 0e2208d78c0f8dde2c45009b254027dbec3429f5 /ext/standard/incomplete_class.c | |
| parent | 0c27a8eb61813f04c92caf578d24bb3b76eb6651 (diff) | |
| parent | 968fbc6acf0bc27be17c0209be7f966e89a55943 (diff) | |
| download | php-git-723ffe2e896f3546b666ba1b1ee677c404a8cf45.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bacport fix bug #68741 - Null pointer dereference
Check that the type is correct
Diffstat (limited to 'ext/standard/incomplete_class.c')
| -rw-r--r-- | ext/standard/incomplete_class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 5d0908e1a3..05619ddbc5 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -144,7 +144,7 @@ PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen) object_properties = Z_OBJPROP_P(object); - if (zend_hash_find(object_properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) { + if (zend_hash_find(object_properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS && Z_TYPE_PP(val) == IS_STRING) { retval = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val)); if (nlen) { |