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

msxml3: Fix parameter validation for endElement().

This commit is contained in:
Nikolay Sivov 2011-08-25 15:32:27 +04:00 committed by Alexandre Julliard
parent 25bf8e5387
commit 0581360411
2 changed files with 90 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/mxwriter.c
View File

@ -801,7 +801,8 @@ static HRESULT WINAPI mxwriter_saxcontent_endElement(
TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri),
debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName)); debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName));
if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6)
return E_INVALIDARG;
xmlOutputBufferWriteString(This->buffer, "</"); xmlOutputBufferWriteString(This->buffer, "</");
s = xmlchar_from_wchar(QName); s = xmlchar_from_wchar(QName);

126
dlls/msxml3/tests/saxreader.c
View File

@ -1380,8 +1380,15 @@ static void test_mxwriter_startenddocument(void)
free_bstrs(); free_bstrs();
} }
struct writer_startelement_t { enum startendtype
{
StartElement,
EndElement
};
struct writer_startendelement_t {
const GUID *clsid; const GUID *clsid;
enum startendtype type;
const char *uri; const char *uri;
const char *local_name; const char *local_name;
const char *qname; const char *qname;
@ -1389,46 +1396,85 @@ struct writer_startelement_t {
HRESULT hr; HRESULT hr;
}; };
static const struct writer_startelement_t writer_startelement[] = { static const struct writer_startendelement_t writer_startendelement[] = {
/* 0 */ /* 0 */
{ &CLSID_MXXMLWriter, NULL, NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter, StartElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, NULL, NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter30, StartElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, NULL, NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter40, StartElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, NULL, NULL, NULL, "<>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, NULL, NULL, NULL, "<>", S_OK },
{ &CLSID_MXXMLWriter, "uri", NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter, StartElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
/* 5 */ /* 5 */
{ &CLSID_MXXMLWriter30, "uri", NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter30, StartElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, "uri", NULL, NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter40, StartElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, "uri", NULL, NULL, "<>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, "uri", NULL, NULL, "<>", S_OK },
{ &CLSID_MXXMLWriter, NULL, "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter, StartElement, NULL, "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, NULL, "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter30, StartElement, NULL, "local", NULL, NULL, E_INVALIDARG },
/* 10 */ /* 10 */
{ &CLSID_MXXMLWriter40, NULL, "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter40, StartElement, NULL, "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, NULL, "local", NULL, "<>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, NULL, "local", NULL, "<>", S_OK },
{ &CLSID_MXXMLWriter, NULL, NULL, "qname", NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter, StartElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, NULL, NULL, "qname", NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter30, StartElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, NULL, NULL, "qname", NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter40, StartElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
/* 15 */ /* 15 */
{ &CLSID_MXXMLWriter60, NULL, NULL, "qname", "<qname>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, NULL, NULL, "qname", "<qname>", S_OK },
{ &CLSID_MXXMLWriter, "uri", "local", "qname", "<qname>", S_OK }, { &CLSID_MXXMLWriter, StartElement, "uri", "local", "qname", "<qname>", S_OK },
{ &CLSID_MXXMLWriter30, "uri", "local", "qname", "<qname>", S_OK }, { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "qname", "<qname>", S_OK },
{ &CLSID_MXXMLWriter40, "uri", "local", "qname", "<qname>", S_OK }, { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "qname", "<qname>", S_OK },
{ &CLSID_MXXMLWriter60, "uri", "local", "qname", "<qname>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "qname", "<qname>", S_OK },
/* 20 */ /* 20 */
{ &CLSID_MXXMLWriter, "uri", "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter, StartElement, "uri", "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, "uri", "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter30, StartElement, "uri", "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, "uri", "local", NULL, NULL, E_INVALIDARG }, { &CLSID_MXXMLWriter40, StartElement, "uri", "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, "uri", "local", NULL, "<>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, "uri", "local", NULL, "<>", S_OK },
{ &CLSID_MXXMLWriter, "uri", "local", "uri:local", "<uri:local>", S_OK }, { &CLSID_MXXMLWriter, StartElement, "uri", "local", "uri:local", "<uri:local>", S_OK },
/* 25 */ /* 25 */
{ &CLSID_MXXMLWriter30, "uri", "local", "uri:local", "<uri:local>", S_OK }, { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "uri:local", "<uri:local>", S_OK },
{ &CLSID_MXXMLWriter40, "uri", "local", "uri:local", "<uri:local>", S_OK }, { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "uri:local", "<uri:local>", S_OK },
{ &CLSID_MXXMLWriter60, "uri", "local", "uri:local", "<uri:local>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "uri:local", "<uri:local>", S_OK },
{ &CLSID_MXXMLWriter, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, { &CLSID_MXXMLWriter, StartElement, "uri", "local", "uri:local2", "<uri:local2>", S_OK },
{ &CLSID_MXXMLWriter30, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, { &CLSID_MXXMLWriter30, StartElement, "uri", "local", "uri:local2", "<uri:local2>", S_OK },
/* 30 */ /* 30 */
{ &CLSID_MXXMLWriter40, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, { &CLSID_MXXMLWriter40, StartElement, "uri", "local", "uri:local2", "<uri:local2>", S_OK },
{ &CLSID_MXXMLWriter60, "uri", "local", "uri:local2", "<uri:local2>", S_OK }, { &CLSID_MXXMLWriter60, StartElement, "uri", "local", "uri:local2", "<uri:local2>", S_OK },
/* endElement tests */
{ &CLSID_MXXMLWriter, EndElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, EndElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, EndElement, NULL, NULL, NULL, NULL, E_INVALIDARG },
/* 35 */
{ &CLSID_MXXMLWriter60, EndElement, NULL, NULL, NULL, "</>", S_OK },
{ &CLSID_MXXMLWriter, EndElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, EndElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, EndElement, "uri", NULL, NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, EndElement, "uri", NULL, NULL, "</>", S_OK },
/* 40 */
{ &CLSID_MXXMLWriter, EndElement, NULL, "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, EndElement, NULL, "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, EndElement, NULL, "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, EndElement, NULL, "local", NULL, "</>", S_OK },
{ &CLSID_MXXMLWriter, EndElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
/* 45 */
{ &CLSID_MXXMLWriter30, EndElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, EndElement, NULL, NULL, "qname", NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter60, EndElement, NULL, NULL, "qname", "</qname>", S_OK },
{ &CLSID_MXXMLWriter, EndElement, "uri", "local", "qname", "</qname>", S_OK },
{ &CLSID_MXXMLWriter30, EndElement, "uri", "local", "qname", "</qname>", S_OK },
/* 50 */
{ &CLSID_MXXMLWriter40, EndElement, "uri", "local", "qname", "</qname>", S_OK },
{ &CLSID_MXXMLWriter60, EndElement, "uri", "local", "qname", "</qname>", S_OK },
{ &CLSID_MXXMLWriter, EndElement, "uri", "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter30, EndElement, "uri", "local", NULL, NULL, E_INVALIDARG },
{ &CLSID_MXXMLWriter40, EndElement, "uri", "local", NULL, NULL, E_INVALIDARG },
/* 55 */
{ &CLSID_MXXMLWriter60, EndElement, "uri", "local", NULL, "</>", S_OK },
{ &CLSID_MXXMLWriter, EndElement, "uri", "local", "uri:local", "</uri:local>", S_OK },
{ &CLSID_MXXMLWriter30, EndElement, "uri", "local", "uri:local", "</uri:local>", S_OK },
{ &CLSID_MXXMLWriter40, EndElement, "uri", "local", "uri:local", "</uri:local>", S_OK },
{ &CLSID_MXXMLWriter60, EndElement, "uri", "local", "uri:local", "</uri:local>", S_OK },
/* 60 */
{ &CLSID_MXXMLWriter, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK },
{ &CLSID_MXXMLWriter30, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK },
{ &CLSID_MXXMLWriter40, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK },
{ &CLSID_MXXMLWriter60, EndElement, "uri", "local", "uri:local2", "</uri:local2>", S_OK },
{ NULL } { NULL }
}; };
@ -1476,7 +1522,7 @@ static BOOL is_mxwriter_supported(const GUID *clsid, const struct msxmlsupported
return FALSE; return FALSE;
} }
static void test_mxwriter_startelement(const struct writer_startelement_t *table) static void test_mxwriter_startendelement_batch(const struct writer_startendelement_t *table)
{ {
int i; int i;
@ -1509,8 +1555,12 @@ static void test_mxwriter_startelement(const struct writer_startelement_t *table
hr = ISAXContentHandler_startDocument(content); hr = ISAXContentHandler_startDocument(content);
EXPECT_HR(hr, S_OK); EXPECT_HR(hr, S_OK);
hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri), if (table->type == StartElement)
_bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), NULL); hr = ISAXContentHandler_startElement(content, _bstr_(table->uri), lstrlen(table->uri),
_bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname), NULL);
else
hr = ISAXContentHandler_endElement(content, _bstr_(table->uri), lstrlen(table->uri),
_bstr_(table->local_name), lstrlen(table->local_name), _bstr_(table->qname), lstrlen(table->qname));
ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr);
/* test output */ /* test output */
@ -1545,7 +1595,7 @@ static void test_mxwriter_startendelement(void)
VARIANT dest; VARIANT dest;
HRESULT hr; HRESULT hr;
test_mxwriter_startelement(writer_startelement); test_mxwriter_startendelement_batch(writer_startendelement);
hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER,
&IID_IMXWriter, (void**)&writer); &IID_IMXWriter, (void**)&writer);