ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webservices: Validate parent nodes in the writer. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2016-06-21 14:04:44 +02:00 committed by Alexandre Julliard
parent b0077f06f0
commit 13ef81e4c0
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/webservices/reader.c
View File

@ -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; 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_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT)
{ {
if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; 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 (!len) goto error;
if (!(parent = read_find_parent( reader ))) goto error; if (!(parent = find_parent( reader->current ))) goto error;
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error;
@ -1217,7 +1216,7 @@ static HRESULT read_text( struct reader *reader )
len += skip; 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; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY;
text = (WS_XML_TEXT_NODE *)node; text = (WS_XML_TEXT_NODE *)node;
@ -1386,7 +1385,7 @@ static HRESULT read_comment( struct reader *reader )
len += skip; 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; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY;
comment = (WS_XML_COMMENT_NODE *)node; 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; if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT;
read_skip( reader, 9 ); 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; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY;
read_insert_node( reader, parent, node ); read_insert_node( reader, parent, node );

1
dlls/webservices/webservices_private.h
View File

@ -45,6 +45,7 @@ struct node
struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN;
void free_node( struct node * ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN;
void destroy_nodes( 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 ) static inline WS_XML_NODE_TYPE node_type( const struct node *node )
{ {

11
dlls/webservices/writer.c
View File

@ -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, static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix,
const WS_XML_STRING *localname, const WS_XML_STRING *ns ) const WS_XML_STRING *localname, const WS_XML_STRING *ns )
{ {
struct node *node; struct node *node, *parent;
WS_XML_ELEMENT_NODE *elem; WS_XML_ELEMENT_NODE *elem;
HRESULT hr; HRESULT hr;
if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT;
if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_flush( writer )) != S_OK) return hr;
if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) 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 ); free_node( node );
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
write_insert_node( writer, writer->current, node ); write_insert_node( writer, parent, node );
writer->state = WRITER_STATE_STARTELEMENT; writer->state = WRITER_STATE_STARTELEMENT;
return S_OK; 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 ) 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; 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; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY;
text = (WS_XML_TEXT_NODE *)node; text = (WS_XML_TEXT_NODE *)node;
text->text = value; text->text = value;
write_insert_node( writer, writer->current, node ); write_insert_node( writer, parent, node );
writer->state = WRITER_STATE_TEXT; writer->state = WRITER_STATE_TEXT;
return S_OK; return S_OK;
} }