Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
62a41d03
Commit
62a41d03
authored
Mar 10, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xmllite/reader: Return correct error for multiple colons in qualified name.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3b83a446
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
reader.c
dlls/xmllite/reader.c
+6
-3
reader.c
dlls/xmllite/tests/reader.c
+2
-0
No files found.
dlls/xmllite/reader.c
View file @
62a41d03
...
...
@@ -1838,7 +1838,7 @@ static HRESULT reader_parse_dtd(xmlreader *reader)
}
/* [11 NS] LocalPart ::= NCName */
static
HRESULT
reader_parse_local
(
xmlreader
*
reader
,
strval
*
local
)
static
HRESULT
reader_parse_local
(
xmlreader
*
reader
,
strval
*
local
,
BOOL
check_for_separator
)
{
WCHAR
*
ptr
;
UINT
start
;
...
...
@@ -1860,6 +1860,9 @@ static HRESULT reader_parse_local(xmlreader *reader, strval *local)
ptr
=
reader_get_ptr
(
reader
);
}
if
(
check_for_separator
&&
*
ptr
==
':'
)
return
NC_E_QNAMECOLON
;
if
(
is_reader_pending
(
reader
))
{
reader
->
resume
[
XmlReadResume_Local
]
=
start
;
...
...
@@ -1898,7 +1901,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc
if
(
reader
->
resume
[
XmlReadResume_Local
])
{
hr
=
reader_parse_local
(
reader
,
local
);
hr
=
reader_parse_local
(
reader
,
local
,
FALSE
);
if
(
FAILED
(
hr
))
return
hr
;
reader_init_strvalue
(
reader
->
resume
[
XmlReadResume_Name
],
...
...
@@ -1923,7 +1926,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc
/* skip ':' */
reader_skipn
(
reader
,
1
);
hr
=
reader_parse_local
(
reader
,
local
);
hr
=
reader_parse_local
(
reader
,
local
,
TRUE
);
if
(
FAILED
(
hr
))
return
hr
;
}
else
...
...
dlls/xmllite/tests/reader.c
View file @
62a41d03
...
...
@@ -1415,6 +1415,8 @@ static struct test_entry element_tests[] = {
{
"<a >"
,
"a"
,
""
,
S_OK
},
{
"<a
\r
\t\n
>"
,
"a"
,
""
,
S_OK
},
{
"</a>"
,
NULL
,
NULL
,
NC_E_QNAMECHARACTER
},
{
"<a:b:c />"
,
NULL
,
NULL
,
NC_E_QNAMECOLON
},
{
"<:b:c />"
,
NULL
,
NULL
,
NC_E_QNAMECHARACTER
},
{
NULL
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment