Hans Leidekker : webservices: Validate parent nodes in the writer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13ef81e4c08bb8f4d032496591e34027d6d5942d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13ef81e4c08bb8f4d032496591...

Author: Hans Leidekker 
Date:   Tue Jun 21 14:04:44 2016 +0200

webservices: Validate parent nodes in the writer.

Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/webservices/reader.c              | 11 +++++------
 dlls/webservices/webservices_private.h |  1 +
 dlls/webservices/writer.c              | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c
index ca8f1bd..8f2d8fb 100644
--- a/dlls/webservices/reader.c
+++ b/dlls/webservices/reader.c
@@ -1100,9 +1100,8 @@ static inline BOOL is_valid_parent( const struct node *node )
     return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF;
 }

-static struct node *read_find_parent( struct reader *reader )
+struct node *find_parent( struct node *node )
 {
-    struct node *node = reader->current;
     if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT)
     {
         if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL;
@@ -1168,7 +1167,7 @@ static HRESULT read_element( struct reader *reader )
     }
     if (!len) goto error;

-    if (!(parent = read_find_parent( reader ))) goto error;
+    if (!(parent = find_parent( reader->current ))) goto error;

hr = E_OUTOFMEMORY;
     if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error;
@@ -1217,7 +1216,7 @@ static HRESULT read_text( struct reader *reader )
         len += skip;
     }

-    if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT;
+    if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT;

if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY;
     text = (WS_XML_TEXT_NODE *)node;
@@ -1386,7 +1385,7 @@ static HRESULT read_comment( struct reader *reader )
         len += skip;
     }

-    if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT;
+    if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT;

if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY;
     comment = (WS_XML_COMMENT_NODE *)node;
@@ -1410,7 +1409,7 @@ static HRESULT read_startcdata( struct reader *reader )
     if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT;
     read_skip( reader, 9 );

-    if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT;
+    if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT;

if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY;
     read_insert_node( reader, parent, node );
diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h
index 363f164..fc888ee 100644
--- a/dlls/webservices/webservices_private.h
+++ b/dlls/webservices/webservices_private.h
@@ -45,6 +45,7 @@ struct node
 struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN;
 void free_node( struct node * ) DECLSPEC_HIDDEN;
 void destroy_nodes( struct node * ) DECLSPEC_HIDDEN;
+struct node *find_parent( struct node * ) DECLSPEC_HIDDEN;

static inline WS_XML_NODE_TYPE node_type( const struct node *node )
 {
diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c
index ebe9b9d..bf4c61b 100644
--- a/dlls/webservices/writer.c
+++ b/dlls/webservices/writer.c
@@ -880,10 +880,11 @@ static HRESULT write_flush( struct writer *writer )
 static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix,
                                        const WS_XML_STRING *localname, const WS_XML_STRING *ns )
 {
-    struct node *node;
+    struct node *node, *parent;
     WS_XML_ELEMENT_NODE *elem;
     HRESULT hr;

+    if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT;
     if ((hr = write_flush( writer )) != S_OK) return hr;

if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT)
@@ -907,7 +908,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN
         free_node( node );
         return E_OUTOFMEMORY;
     }
-    write_insert_node( writer, writer->current, node );
+    write_insert_node( writer, parent, node );
     writer->state = WRITER_STATE_STARTELEMENT;
     return S_OK;
 }
@@ -938,14 +939,16 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT

static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value )
 {
-    struct node *node;
+    struct node *node, *parent;
     WS_XML_TEXT_NODE *text;

+    if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT;
+
     if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY;
     text = (WS_XML_TEXT_NODE *)node;
     text->text = value;

-    write_insert_node( writer, writer->current, node );
+    write_insert_node( writer, parent, node );
     writer->state = WRITER_STATE_TEXT;
     return S_OK;
 }