diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-04 16:44:06 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-11-04 16:44:45 +0100 |
commit | 0afc818976a3f0f353916fc1f81e8c82a11fb68b (patch) | |
tree | e2d4a4eb36f7953336f9675c3d54f45227eecc04 /ext/soap/php_sdl.c | |
parent | 4daa413898948dad90bc797ccab200115326efc7 (diff) | |
parent | 625f614cb13536d805985a2008840452c6c86a26 (diff) | |
download | php-git-0afc818976a3f0f353916fc1f81e8c82a11fb68b.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
Diffstat (limited to 'ext/soap/php_sdl.c')
-rw-r--r-- | ext/soap/php_sdl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 695867d7e2..2485ef2fd8 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2449,7 +2449,7 @@ static HashTable* make_persistent_sdl_function_headers(HashTable *headers, HashT pheader->ns = strdup(pheader->ns); } - if (pheader->encode->details.sdl_type) { + if (pheader->encode && pheader->encode->details.sdl_type) { if ((penc = zend_hash_str_find_ptr(ptr_map, (char*)&pheader->encode, sizeof(encodePtr))) == NULL) { assert(0); } |