diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 01:22:46 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-17 01:23:22 +0200 |
| commit | 1d24ac46abe49758abb058fe43aaac811a514e8c (patch) | |
| tree | fe463b9f1213bf37fdbff4f0c12337ddb32864b5 /ext/xml/xml.c | |
| parent | abc7d1f14072b841a845a60de38f72e5fcf602cc (diff) | |
| parent | 6202b47e63dabe1434722c275925c23029deac8d (diff) | |
| download | php-git-1d24ac46abe49758abb058fe43aaac811a514e8c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
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 72f629ba2c..c08e3818d5 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -498,7 +498,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) { |