diff options
| author | Stanislav Malyshev <stas@php.net> | 2021-01-31 21:42:41 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2021-01-31 21:42:41 -0800 |
| commit | 86de4d7af6d8bf6aa2955b158a12272f76ceb97e (patch) | |
| tree | 123fa870bb092698f48bad33c7760d18ec811acf /ext/soap/php_xml.c | |
| parent | aeb4f21549816570456feccb552d4c18c5d98945 (diff) | |
| parent | 3c939e3f69955d087e0bb671868f7267dfb2a502 (diff) | |
| download | php-git-86de4d7af6d8bf6aa2955b158a12272f76ceb97e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #80672 - Null Dereference in SoapClient
Diffstat (limited to 'ext/soap/php_xml.c')
| -rw-r--r-- | ext/soap/php_xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index b606030179..18a266179b 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -199,7 +199,7 @@ xmlNsPtr node_find_ns(xmlNodePtr node) int attr_is_equal_ex(xmlAttrPtr node, char *name, char *ns) { - if (name == NULL || strcmp((char*)node->name, name) == 0) { + if (name == NULL || ((node->name) && strcmp((char*)node->name, name) == 0)) { if (ns) { xmlNsPtr nsPtr = attr_find_ns(node); if (nsPtr) { @@ -215,7 +215,7 @@ int attr_is_equal_ex(xmlAttrPtr node, char *name, char *ns) int node_is_equal_ex(xmlNodePtr node, char *name, char *ns) { - if (name == NULL || strcmp((char*)node->name, name) == 0) { + if (name == NULL || ((node->name) && strcmp((char*)node->name, name) == 0)) { if (ns) { xmlNsPtr nsPtr = node_find_ns(node); if (nsPtr) { |