From 83647013afb6a071e43cb20a1b2ab3cfe2b6b5db Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 31 Aug 2007 10:48:45 +0000 Subject: [PATCH] Fixed bug #42359 (xsd:list type not parsed) --- NEWS | 1 + ext/soap/php_schema.c | 28 +++++++++++++-- ext/soap/soap.c | 38 ++++++++++++++++++-- ext/soap/tests/bugs/bug42359.phpt | 20 +++++++++++ ext/soap/tests/bugs/bug42359.wsdl | 58 +++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 6 deletions(-) create mode 100755 ext/soap/tests/bugs/bug42359.phpt create mode 100755 ext/soap/tests/bugs/bug42359.wsdl diff --git a/NEWS b/NEWS index 063e27ed5c..27bf9e96f7 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ PHP NEWS DOMElement). (Rob) - Fixed bug #42452 (PDO classes do not expose Reflection API information). (Hannes) +- Fixed bug #42359 (xsd:list type not parsed). (Dmitry) - Fixed bug #42326 (SoapServer crash). (Dmitry) - Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl). (Dmitry) diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 9ba4f81604..0ae65ba39e 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -453,7 +453,14 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP newType = emalloc(sizeof(sdlType)); memset(newType, 0, sizeof(sdlType)); - newType->name = estrdup("anonymous"); + { + smart_str anonymous = {0}; + + smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_0(&anonymous); + newType->name = anonymous.c; + } newType->namens = estrdup((char*)tns->children->content); if (cur_type->elements == NULL) { @@ -463,6 +470,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP zend_hash_next_index_insert(cur_type->elements, &newType, sizeof(sdlTypePtr), (void **)&tmp); schema_simpleType(sdl, tns, trav, newType); + trav = trav->next; } if (trav != NULL) { @@ -541,7 +549,14 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp newType = emalloc(sizeof(sdlType)); memset(newType, 0, sizeof(sdlType)); - newType->name = estrdup("anonymous"); + { + smart_str anonymous = {0}; + + smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_0(&anonymous); + newType->name = anonymous.c; + } newType->namens = estrdup((char*)tns->children->content); if (cur_type->elements == NULL) { @@ -1879,7 +1894,14 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl } dummy_type = emalloc(sizeof(sdlType)); memset(dummy_type, 0, sizeof(sdlType)); - dummy_type->name = estrdup("anonymous"); + { + smart_str anonymous = {0}; + + smart_str_appendl(&anonymous, "anonymous", sizeof("anonymous")-1); + smart_str_append_long(&anonymous, zend_hash_num_elements(sdl->types)); + smart_str_0(&anonymous); + dummy_type->name = anonymous.c; + } dummy_type->namens = estrdup((char*)tns->children->content); schema_simpleType(sdl, tns, trav, dummy_type); newAttr->encode = dummy_type->encode; diff --git a/ext/soap/soap.c b/ext/soap/soap.c index a27626110e..87d2b43056 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2878,8 +2878,8 @@ PHP_METHOD(SoapClient, __getTypes) while (zend_hash_get_current_data_ex(sdl->types, (void **)&type, &pos) != FAILURE) { type_to_string((*type), &buf, 0); add_next_index_stringl(return_value, buf.c, buf.len, 1); - zend_hash_move_forward_ex(sdl->types, &pos); smart_str_free(&buf); + zend_hash_move_forward_ex(sdl->types, &pos); } } } @@ -4546,8 +4546,6 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) switch (type->kind) { case XSD_TYPEKIND_SIMPLE: - case XSD_TYPEKIND_LIST: - case XSD_TYPEKIND_UNION: if (type->encode) { smart_str_appendl(buf, type->encode->details.type_str, strlen(type->encode->details.type_str)); smart_str_appendc(buf, ' '); @@ -4556,6 +4554,40 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level) } smart_str_appendl(buf, type->name, strlen(type->name)); break; + case XSD_TYPEKIND_LIST: + smart_str_appendl(buf, "list ", 5); + smart_str_appendl(buf, type->name, strlen(type->name)); + if (type->elements) { + sdlTypePtr *item_type; + + smart_str_appendl(buf, " {", 2); + zend_hash_internal_pointer_reset_ex(type->elements, &pos); + if (zend_hash_get_current_data_ex(type->elements, (void **)&item_type, &pos) != FAILURE) { + smart_str_appendl(buf, (*item_type)->name, strlen((*item_type)->name)); + } + smart_str_appendc(buf, '}'); + } + break; + case XSD_TYPEKIND_UNION: + smart_str_appendl(buf, "union ", 6); + smart_str_appendl(buf, type->name, strlen(type->name)); + if (type->elements) { + sdlTypePtr *item_type; + int first = 0; + + smart_str_appendl(buf, " {", 2); + zend_hash_internal_pointer_reset_ex(type->elements, &pos); + while (zend_hash_get_current_data_ex(type->elements, (void **)&item_type, &pos) != FAILURE) { + if (!first) { + smart_str_appendc(buf, ','); + first = 0; + } + smart_str_appendl(buf, (*item_type)->name, strlen((*item_type)->name)); + zend_hash_move_forward_ex(type->elements, &pos); + } + smart_str_appendc(buf, '}'); + } + break; case XSD_TYPEKIND_COMPLEX: case XSD_TYPEKIND_RESTRICTION: case XSD_TYPEKIND_EXTENSION: diff --git a/ext/soap/tests/bugs/bug42359.phpt b/ext/soap/tests/bugs/bug42359.phpt new file mode 100755 index 0000000000..94738fff34 --- /dev/null +++ b/ext/soap/tests/bugs/bug42359.phpt @@ -0,0 +1,20 @@ +--TEST-- +Bug #42326 (SoapServer crash) +--SKIPIF-- + +--INI-- +soap.wsdl_cache_enabled=0 +--FILE-- +__getTypes()); +?> +--EXPECT-- +Array +( + [0] => list listItem {anonymous1} + [1] => string anonymous1 + [2] => string enumItem + [3] => list listItem2 {enumItem} +) + diff --git a/ext/soap/tests/bugs/bug42359.wsdl b/ext/soap/tests/bugs/bug42359.wsdl new file mode 100755 index 0000000000..bc73adaec6 --- /dev/null +++ b/ext/soap/tests/bugs/bug42359.wsdl @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Test request + + + + + + + + + + + + + + + + + + + + + + + -- 2.40.0