From: Dmitry Stogov Date: Thu, 15 May 2014 13:17:09 +0000 (+0400) Subject: key->len doesn't include trailing space anymore X-Git-Tag: POST_PHPNG_MERGE~357^2^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3610c5cf02d011c10beabeeabb38b39e6c00d872;p=php key->len doesn't include trailing space anymore --- diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 861a2787b6..570b1ad640 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1029,22 +1029,22 @@ static HashTable* soap_create_typemap(sdlPtr sdl, HashTable *ht TSRMLS_DC) ZEND_HASH_FOREACH_STR_KEY_VAL(ht2, name, tmp) { if (name) { - if (name->len == sizeof("type_name") && + if (name->len == sizeof("type_name")-1 && strncmp(name->val, "type_name", sizeof("type_name")-1) == 0) { if (Z_TYPE_P(tmp) == IS_STRING) { type_name = Z_STRVAL_P(tmp); } else if (Z_TYPE_P(tmp) != IS_NULL) { } - } else if (name->len == sizeof("type_ns") && + } else if (name->len == sizeof("type_ns")-1 && strncmp(name->val, "type_ns", sizeof("type_ns")-1) == 0) { if (Z_TYPE_P(tmp) == IS_STRING) { type_ns = Z_STRVAL_P(tmp); } else if (Z_TYPE_P(tmp) != IS_NULL) { } - } else if (name->len == sizeof("to_xml") && + } else if (name->len == sizeof("to_xml")-1 && strncmp(name->val, "to_xml", sizeof("to_xml")-1) == 0) { to_xml = tmp; - } else if (name->len == sizeof("from_xml") && + } else if (name->len == sizeof("from_xml")-1 && strncmp(name->val, "from_xml", sizeof("from_xml")-1) == 0) { to_zval = tmp; }