From 5da0579259aab958093ca473cb2cc9dff9fd7813 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 29 Apr 2019 13:51:26 +0200 Subject: Fixed bug #77945 Make sure that we proper distinguish between empty string key and no key during SDL serialization. --- ext/soap/php_sdl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/soap/php_sdl.c') diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 2485ef2fd8..d16056e4a3 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -1174,7 +1174,7 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri) return ctx.sdl; } -#define WSDL_CACHE_VERSION 0x0f +#define WSDL_CACHE_VERSION 0x10 #define WSDL_CACHE_GET(ret,type,buf) memcpy(&ret,*buf,sizeof(type)); *buf += sizeof(type); #define WSDL_CACHE_GET_INT(ret,buf) ret = ((unsigned char)(*buf)[0])|((unsigned char)(*buf)[1]<<8)|((unsigned char)(*buf)[2]<<16)|((int)(*buf)[3]<<24); *buf += 4; @@ -1189,13 +1189,15 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri) #define WSDL_CACHE_PUT_1(val,buf) smart_str_appendc(buf,val); #define WSDL_CACHE_PUT_N(val,n,buf) smart_str_appendl(buf,(char*)val,n); +#define WSDL_NO_STRING_MARKER 0x7fffffff + static char* sdl_deserialize_string(char **in) { char *s; int len; WSDL_CACHE_GET_INT(len, in); - if (len == 0x7fffffff) { + if (len == WSDL_NO_STRING_MARKER) { return NULL; } else { s = emalloc(len+1); @@ -1210,7 +1212,7 @@ static void sdl_deserialize_key(HashTable* ht, void* data, char **in) int len; WSDL_CACHE_GET_INT(len, in); - if (len == 0) { + if (len == WSDL_NO_STRING_MARKER) { zend_hash_next_index_insert_ptr(ht, data); } else { zend_hash_str_add_ptr(ht, *in, len, data); @@ -1778,16 +1780,14 @@ static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t, time static void sdl_serialize_string(const char *str, smart_str *out) { - int i; - if (str) { - i = strlen(str); + int i = strlen(str); WSDL_CACHE_PUT_INT(i, out); if (i > 0) { WSDL_CACHE_PUT_N(str, i, out); } } else { - WSDL_CACHE_PUT_INT(0x7fffffff, out); + WSDL_CACHE_PUT_INT(WSDL_NO_STRING_MARKER, out); } } @@ -1798,7 +1798,7 @@ static void sdl_serialize_key(zend_string *key, smart_str *out) WSDL_CACHE_PUT_INT(ZSTR_LEN(key), out); WSDL_CACHE_PUT_N(ZSTR_VAL(key), ZSTR_LEN(key), out); } else { - WSDL_CACHE_PUT_INT(0, out); + WSDL_CACHE_PUT_INT(WSDL_NO_STRING_MARKER, out); } } -- cgit v1.2.1