system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

webservices: Avoid accessing the old user buffer in WsSetOutput/ToBuffer.

Browse source 
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2018-06-20 15:04:45 +02:00 committed by Alexandre Julliard
parent ab2f25d40c
commit e222e88ac4
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/webservices/writer.c
View file

@ -39,7 +39,7 @@ static const struct prop_desc writer_props[] =
{ {
{ sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_DEPTH */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_DEPTH */
{ sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT */ { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT */
{ sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES */
{ sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_WRITE_DECLARATION */ { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_WRITE_DECLARATION */
{ sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_INDENT */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_INDENT */
{ sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE */
@ -85,6 +85,7 @@ struct writer
WS_CHARSET output_charset; WS_CHARSET output_charset;
WS_XML_WRITER_OUTPUT_TYPE output_type; WS_XML_WRITER_OUTPUT_TYPE output_type;
struct xmlbuf *output_buf; struct xmlbuf *output_buf;
BOOL output_buf_user;
WS_HEAP *output_heap; WS_HEAP *output_heap;
const WS_XML_DICTIONARY *dict; const WS_XML_DICTIONARY *dict;
BOOL dict_do_lookup; BOOL dict_do_lookup;
@ -332,7 +333,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT
static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf )
{ {
/* free current buffer if it's ours */ /* free current buffer if it's ours */
if (writer->output_buf && writer->output_buf->heap == writer->output_heap) if (writer->output_buf && !writer->output_buf_user)
{ {
free_xmlbuf( writer->output_buf ); free_xmlbuf( writer->output_buf );
} }
@ -419,6 +420,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING
goto done; goto done;
} }
set_output_buffer( writer, xmlbuf ); set_output_buffer( writer, xmlbuf );
writer->output_buf_user = FALSE;
break; break;
} }
default: default:
@ -472,6 +474,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer
writer->output_enc = xmlbuf->encoding; writer->output_enc = xmlbuf->encoding;
writer->output_charset = xmlbuf->charset; writer->output_charset = xmlbuf->charset;
set_output_buffer( writer, xmlbuf ); set_output_buffer( writer, xmlbuf );
writer->output_buf_user = TRUE;
if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY;
else write_insert_bof( writer, node ); else write_insert_bof( writer, node );