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
ba018b52
Commit
ba018b52
authored
Mar 17, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3/saxreader: Handle NULL interface input in parse().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a5031391
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
saxreader.c
dlls/msxml3/saxreader.c
+3
-0
saxreader.c
dlls/msxml3/tests/saxreader.c
+10
-0
No files found.
dlls/msxml3/saxreader.c
View file @
ba018b52
...
@@ -2664,6 +2664,9 @@ static HRESULT internal_parse(
...
@@ -2664,6 +2664,9 @@ static HRESULT internal_parse(
ISequentialStream
*
stream
=
NULL
;
ISequentialStream
*
stream
=
NULL
;
IXMLDOMDocument
*
xmlDoc
;
IXMLDOMDocument
*
xmlDoc
;
if
(
!
V_UNKNOWN
(
&
varInput
))
return
E_INVALIDARG
;
if
(
IUnknown_QueryInterface
(
V_UNKNOWN
(
&
varInput
),
if
(
IUnknown_QueryInterface
(
V_UNKNOWN
(
&
varInput
),
&
IID_IXMLDOMDocument
,
(
void
**
)
&
xmlDoc
)
==
S_OK
)
&
IID_IXMLDOMDocument
,
(
void
**
)
&
xmlDoc
)
==
S_OK
)
{
{
...
...
dlls/msxml3/tests/saxreader.c
View file @
ba018b52
...
@@ -2221,6 +2221,16 @@ static void test_saxreader(void)
...
@@ -2221,6 +2221,16 @@ static void test_saxreader(void)
SafeArrayDestroy
(
sa
);
SafeArrayDestroy
(
sa
);
V_VT
(
&
var
)
=
VT_UNKNOWN
;
V_UNKNOWN
(
&
var
)
=
NULL
;
hr
=
ISAXXMLReader_parse
(
reader
,
var
);
ok
(
hr
==
E_INVALIDARG
,
"got %#x
\n
"
,
hr
);
V_VT
(
&
var
)
=
VT_DISPATCH
;
V_DISPATCH
(
&
var
)
=
NULL
;
hr
=
ISAXXMLReader_parse
(
reader
,
var
);
ok
(
hr
==
E_INVALIDARG
,
"got %#x
\n
"
,
hr
);
stream
=
create_test_stream
(
testXML
,
-
1
);
stream
=
create_test_stream
(
testXML
,
-
1
);
V_VT
(
&
var
)
=
VT_UNKNOWN
;
V_VT
(
&
var
)
=
VT_UNKNOWN
;
V_UNKNOWN
(
&
var
)
=
(
IUnknown
*
)
stream
;
V_UNKNOWN
(
&
var
)
=
(
IUnknown
*
)
stream
;
...
...
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