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
876de4a7
Commit
876de4a7
authored
Mar 13, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xmllite/reader: Reset reader nesting depth on error.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ec9e05c2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
reader.c
dlls/xmllite/reader.c
+1
-0
reader.c
dlls/xmllite/tests/reader.c
+0
-3
No files found.
dlls/xmllite/reader.c
View file @
876de4a7
...
@@ -2847,6 +2847,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype)
...
@@ -2847,6 +2847,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype)
{
{
This
->
state
=
XmlReadState_Error
;
This
->
state
=
XmlReadState_Error
;
This
->
nodetype
=
XmlNodeType_None
;
This
->
nodetype
=
XmlNodeType_None
;
This
->
depth
=
0
;
This
->
error
=
hr
;
This
->
error
=
hr
;
}
}
}
}
...
...
dlls/xmllite/tests/reader.c
View file @
876de4a7
...
@@ -2402,7 +2402,6 @@ static void test_max_element_depth(void)
...
@@ -2402,7 +2402,6 @@ static void test_max_element_depth(void)
hr
=
IXmlReader_Read
(
reader
,
NULL
);
hr
=
IXmlReader_Read
(
reader
,
NULL
);
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
todo_wine
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
...
@@ -2412,7 +2411,6 @@ todo_wine
...
@@ -2412,7 +2411,6 @@ todo_wine
hr
=
IXmlReader_Read
(
reader
,
NULL
);
hr
=
IXmlReader_Read
(
reader
,
NULL
);
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
todo_wine
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
IStream_Release
(
stream
);
IStream_Release
(
stream
);
...
@@ -2454,7 +2452,6 @@ todo_wine
...
@@ -2454,7 +2452,6 @@ todo_wine
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
ok
(
hr
==
SC_E_MAXELEMENTDEPTH
,
"got %08x
\n
"
,
hr
);
ok
(
nodetype
==
XmlNodeType_None
,
"got node type %d
\n
"
,
nodetype
);
ok
(
nodetype
==
XmlNodeType_None
,
"got node type %d
\n
"
,
nodetype
);
todo_wine
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_DEPTH2
(
reader
,
0
,
2
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
TEST_READER_STATE
(
reader
,
XmlReadState_Error
);
...
...
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