diff options
author | Matteo Beccati <mbeccati@php.net> | 2015-11-07 11:05:36 +0100 |
---|---|---|
committer | Matteo Beccati <mbeccati@php.net> | 2015-11-07 11:05:36 +0100 |
commit | c263dcee2ff727946b66380b6374f5d753bd8d36 (patch) | |
tree | a722788ea4c026bad1f15c114355bedddef92123 /ext/soap/php_sdl.c | |
parent | f2853386b139cc29c098cff9ec334b9e8f589e91 (diff) | |
parent | fd61666d96277779b1b85f59a0651cb42eed3420 (diff) | |
download | php-git-c263dcee2ff727946b66380b6374f5d753bd8d36.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
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 84166780a6..6efd2b06c0 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -112,7 +112,7 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) { encodePtr enc = NULL; char *nscat; - int ns_len = strlen(ns); + int ns_len = ns ? strlen(ns) : 0; int type_len = strlen(type); int len = ns_len + type_len + 1; |