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

xmllite: Allocate value in reader_add_attr. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-03-31 15:58:21 +02:00 committed by Alexandre Julliard
parent daf0504570
commit 1b9b791c41
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/xmllite/reader.c
View File

@ -409,6 +409,7 @@ static void reader_clear_attrs(xmlreader *reader)
LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry)
{ {
reader_free_strvalued(reader, &attr->localname); reader_free_strvalued(reader, &attr->localname);
reader_free_strvalued(reader, &attr->value);
reader_free(reader, attr); reader_free(reader, attr);
} }
list_init(&reader->attrs); list_init(&reader->attrs);
@ -428,6 +429,12 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn
if (!attr) return E_OUTOFMEMORY; if (!attr) return E_OUTOFMEMORY;
hr = reader_strvaldup(reader, localname, &attr->localname); hr = reader_strvaldup(reader, localname, &attr->localname);
if (hr == S_OK)
{
hr = reader_strvaldup(reader, value, &attr->value);
if (hr != S_OK)
reader_free_strvalued(reader, &attr->value);
}
if (hr != S_OK) if (hr != S_OK)
{ {
reader_free(reader, attr); reader_free(reader, attr);
@ -439,7 +446,6 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn
else else
memset(&attr->prefix, 0, sizeof(attr->prefix)); memset(&attr->prefix, 0, sizeof(attr->prefix));
attr->qname = qname ? *qname : *localname; attr->qname = qname ? *qname : *localname;
attr->value = *value;
attr->position = *position; attr->position = *position;
attr->flags = flags; attr->flags = flags;
list_add_tail(&reader->attrs, &attr->entry); list_add_tail(&reader->attrs, &attr->entry);
@ -3303,7 +3309,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated)
return &ns->uri; return &ns->uri;
} }
break; return &reader->attr->value;
default: default:
break; break;
} }

4
dlls/xmllite/tests/reader.c
View File

@ -2483,7 +2483,7 @@ static void test_reader_position(void)
static void test_string_pointers(void) static void test_string_pointers(void)
{ {
const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr; const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr, *value;
IXmlReader *reader; IXmlReader *reader;
HRESULT hr; HRESULT hr;
@ -2592,10 +2592,12 @@ static void test_string_pointers(void)
read_node(reader, XmlNodeType_Element); read_node(reader, XmlNodeType_Element);
next_attribute(reader); next_attribute(reader);
name = reader_name(reader, "attr"); name = reader_name(reader, "attr");
value = reader_value(reader, "value");
move_to_element(reader); move_to_element(reader);
next_attribute(reader); next_attribute(reader);
ok(name == reader_name(reader, "attr"), "attr pointer changed\n"); ok(name == reader_name(reader, "attr"), "attr pointer changed\n");
ok(value == reader_value(reader, "value"), "value pointer changed\n");
IXmlReader_Release(reader); IXmlReader_Release(reader);
} }