]> granicus.if.org Git - php/commitdiff
key->len doesn't include trailing space anymore
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 13:17:09 +0000 (17:17 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 13:17:09 +0000 (17:17 +0400)
ext/soap/soap.c

index 861a2787b63a1a8b8fefb437d322502d2ae52f9f..570b1ad6402bc055b7e9caefe2108d6f2e5e5d20 100644 (file)
@@ -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;
                                }