Commit 272af8fa authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Skip xml comments in manifests.

parent 214fb6e8
...@@ -541,14 +541,31 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) ...@@ -541,14 +541,31 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem)
{ {
const char* ptr; const char* ptr;
for (;;)
{
ptr = memchr(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); ptr = memchr(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr);
if (!ptr) if (!ptr)
{ {
xmlbuf->ptr = xmlbuf->end; xmlbuf->ptr = xmlbuf->end;
return FALSE; return FALSE;
} }
ptr++;
if (ptr + 3 < xmlbuf->end && !strncmp( ptr, "!--", 3 )) /* skip comment */
{
for (ptr += 3; ptr + 3 <= xmlbuf->end; ptr++)
if (ptr[0] == '-' && ptr[1] == '-' && ptr[2] == '>') break;
if (ptr + 3 > xmlbuf->end)
{
xmlbuf->ptr = xmlbuf->end;
return FALSE;
}
xmlbuf->ptr = ptr + 3;
}
else break;
}
xmlbuf->ptr = ++ptr; xmlbuf->ptr = ptr;
while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>') while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>')
ptr++; ptr++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment