Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
473c5c4c
Commit
473c5c4c
authored
Jun 21, 2010
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 21, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Don't crash on null pointer when doing ::Next() on a last child.
parent
b00046cc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
xmlelem.c
dlls/msxml3/tests/xmlelem.c
+10
-0
xmlelem.c
dlls/msxml3/xmlelem.c
+12
-5
No files found.
dlls/msxml3/tests/xmlelem.c
View file @
473c5c4c
...
...
@@ -357,6 +357,16 @@ static void test_xmlelem_collection(void)
ok
(
V_VT
(
&
var
)
==
VT_DISPATCH
,
"Expected VT_DISPATCH, got %d
\n
"
,
V_VT
(
&
var
));
ok
(
num_vars
==
1
,
"Expected 1, got %d
\n
"
,
num_vars
);
/* try advance further, no children left */
hr
=
IEnumVARIANT_Next
(
enumVar
,
1
,
&
var
,
&
num_vars
);
ok
(
hr
==
S_FALSE
,
"Expected S_FALSE, got %08x
\n
"
,
hr
);
ok
(
V_VT
(
&
var
)
==
0
,
"Expected 0, got %d
\n
"
,
V_VT
(
&
var
));
ok
(
num_vars
==
0
,
"Expected 0, got %d
\n
"
,
num_vars
);
hr
=
IEnumVARIANT_Next
(
enumVar
,
1
,
&
var
,
NULL
);
ok
(
hr
==
S_FALSE
,
"Expected S_FALSE, got %08x
\n
"
,
hr
);
ok
(
V_VT
(
&
var
)
==
0
,
"Expected 0, got %d
\n
"
,
V_VT
(
&
var
));
hr
=
IUnknown_QueryInterface
(
V_DISPATCH
(
&
var
),
&
IID_IXMLElement
,
(
LPVOID
*
)
&
child
);
ok
(
hr
==
S_OK
,
"Expected S_OK, got %08x
\n
"
,
hr
);
ok
(
child
!=
NULL
,
"Expected non-NULL child
\n
"
);
...
...
dlls/msxml3/xmlelem.c
View file @
473c5c4c
...
...
@@ -723,21 +723,28 @@ static ULONG WINAPI xmlelem_collection_IEnumVARIANT_Release(
}
static
HRESULT
WINAPI
xmlelem_collection_IEnumVARIANT_Next
(
IEnumVARIANT
*
iface
,
ULONG
celt
,
VARIANT
*
rgVar
,
ULONG
*
pCeltF
etched
)
IEnumVARIANT
*
iface
,
ULONG
celt
,
VARIANT
*
rgVar
,
ULONG
*
f
etched
)
{
xmlelem_collection
*
This
=
impl_from_IEnumVARIANT
(
iface
);
xmlNodePtr
ptr
=
This
->
current
;
TRACE
(
"(%p, %d, %p, %p)
\n
"
,
iface
,
celt
,
rgVar
,
pCeltF
etched
);
TRACE
(
"(%p, %d, %p, %p)
\n
"
,
iface
,
celt
,
rgVar
,
f
etched
);
if
(
!
rgVar
)
return
E_INVALIDARG
;
/* FIXME: handle celt */
if
(
pCeltF
etched
)
*
pCeltF
etched
=
1
;
if
(
f
etched
)
*
f
etched
=
1
;
This
->
current
=
This
->
current
->
next
;
if
(
This
->
current
)
This
->
current
=
This
->
current
->
next
;
else
{
V_VT
(
rgVar
)
=
VT_EMPTY
;
if
(
fetched
)
*
fetched
=
0
;
return
S_FALSE
;
}
V_VT
(
rgVar
)
=
VT_DISPATCH
;
return
XMLElement_create
((
IUnknown
*
)
iface
,
ptr
,
(
LPVOID
*
)
&
V_DISPATCH
(
rgVar
),
FALSE
);
...
...
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