diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 01:14:12 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 01:22:11 +0200 |
| commit | 6202b47e63dabe1434722c275925c23029deac8d (patch) | |
| tree | bc9bf21beb011a38071371aa984eee4f60252438 /ext/xml/xml.c | |
| parent | 20f76efb78b1fbe7b9af505ce2995436516e473a (diff) | |
| parent | 1bb92d52121cf2635df163911216bf2958db4d34 (diff) | |
| download | php-git-6202b47e63dabe1434722c275925c23029deac8d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index d788b9b0b8..aabb414157 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -500,7 +500,8 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f if (Z_TYPE_P(handler) == IS_STRING) { php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(handler)); - } else if ((obj = zend_hash_index_find(Z_ARRVAL_P(handler), 0)) != NULL && + } else if (Z_TYPE_P(handler) == IS_ARRAY && + (obj = zend_hash_index_find(Z_ARRVAL_P(handler), 0)) != NULL && (method = zend_hash_index_find(Z_ARRVAL_P(handler), 1)) != NULL && Z_TYPE_P(obj) == IS_OBJECT && Z_TYPE_P(method) == IS_STRING) { |