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

webservices: Don't advance binary encoding reader if record type doesn't match. 

Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Connor McAdams 2022-04-20 11:56:10 +02:00 committed by Alexandre Julliard
parent 43fe980818
commit 9eb26280f3
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/webservices/reader.c
View File

@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE
GUID guid;
HRESULT hr;
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (!is_text_type( type )) return WS_E_INVALID_FORMAT;
read_skip( reader, 1 );
switch (type)
{
@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret
unsigned char type = 0;
HRESULT hr;
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT;
if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY;
read_skip( reader, 1 );
if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z)
{
@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader )
unsigned char type;
HRESULT hr;
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (!is_element_type( type )) return WS_E_INVALID_FORMAT;
read_skip( reader, 1 );
if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY;
node = (struct node *)elem;
@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader )
GUID uuid;
HRESULT hr;
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT;
read_skip( reader, 1 );
switch (type)
{
@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader )
if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT))
{
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT;
read_skip( reader, 1 );
}
if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT;
@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader )
ULONG len;
HRESULT hr;
if ((hr = read_byte( reader, &type )) != S_OK) return hr;
if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr;
if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT;
read_skip( reader, 1 );
if ((hr = read_int31( reader, &len )) != S_OK) return hr;
if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT;

15
dlls/webservices/tests/reader.c
View File

@ -5764,15 +5764,12 @@ static void test_binary_encoding(void)
hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s,
WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL );
todo_wine ok( hr == S_OK, "got %#lx\n", hr );
if (SUCCEEDED(hr))
{
ok( test_struct->a == 1, "got %d\n", test_struct->a );
ok( !!test_struct->s, "s is not set\n" );
ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a );
ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b );
ok( test_struct->b == 1, "got %d\n", test_struct->b );
}
ok( hr == S_OK, "got %#lx\n", hr );
ok( test_struct->a == 1, "got %d\n", test_struct->a );
ok( !!test_struct->s, "s is not set\n" );
ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a );
ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b );
ok( test_struct->b == 1, "got %d\n", test_struct->b );
WsFreeHeap( heap );
WsFreeReader( reader );