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

ntdll: Fix 'description' element parsing to allow empty elements.

This commit is contained in:
Nikolay Sivov 2014-12-26 21:07:46 +03:00 committed by Alexandre Julliard
parent 37c179794e
commit c134466224
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel32/tests/actctx.c
View File

@ -97,6 +97,7 @@ static const char manifest3[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\""
" publicKeyToken=\"6595b6414666f1df\" />" " publicKeyToken=\"6595b6414666f1df\" />"
"<description />"
"<file name=\"testlib.dll\">" "<file name=\"testlib.dll\">"
"<windowClass>wndClass</windowClass>" "<windowClass>wndClass</windowClass>"
" <comClass description=\"Test com class\"" " <comClass description=\"Test com class\""

13
dlls/ntdll/actctx.c
View File

@ -1834,11 +1834,16 @@ static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf)
static BOOL parse_description_elem(xmlbuf_t* xmlbuf) static BOOL parse_description_elem(xmlbuf_t* xmlbuf)
{ {
xmlstr_t elem, content; xmlstr_t elem, content, attr_name, attr_value;
BOOL end = FALSE, ret = TRUE; BOOL end = FALSE, ret = TRUE, error = FALSE;
if (!parse_expect_no_attr(xmlbuf, &end) || end || while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end))
!parse_text_content(xmlbuf, &content)) WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));
if (error) return FALSE;
if (end) return TRUE;
if (!parse_text_content(xmlbuf, &content))
return FALSE; return FALSE;
TRACE("Got description %s\n", debugstr_xmlstr(&content)); TRACE("Got description %s\n", debugstr_xmlstr(&content));