com php-src: key->len doesn't include trailing space anymore: ext/soap/soap.c
| From: | Dmitry Stogov | Date: | Thu, 15 May 2014 13:17:09 +0000 |
| Subject: | com php-src: key->len doesn't include trailing space anymore: ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78379@lists.php.net to get a copy of this message | ||
Commit: 3610c5cf02d011c10beabeeabb38b39e6c00d872
Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 May 2014 17:17:09 +0400
Parents: 40a8156966542e35d77679dda374217ba25b3c36
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3610c5cf02d011c10beabeeabb38b39e6c00d872
Log:
key->len doesn't include trailing space anymore
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 861a278..570b1ad 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;
}