Alistair Leslie-Hughes : msxml3: Added checks for invalid arguments in queryresult.
Alexandre Julliard
julliard at winehq.org
Thu Jul 3 06:35:44 CDT 2008
Module: wine
Branch: master
Commit: 212335e0b8bab15ce01ce6a3403db29019fa6c86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=212335e0b8bab15ce01ce6a3403db29019fa6c86
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed Jul 2 16:15:55 2008 +1000
msxml3: Added checks for invalid arguments in queryresult.
---
dlls/msxml3/queryresult.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
index d4b837e..1b2070e 100644
--- a/dlls/msxml3/queryresult.c
+++ b/dlls/msxml3/queryresult.c
@@ -118,6 +118,9 @@ static HRESULT WINAPI queryresult_QueryInterface(
{
TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject);
+ if(!ppvObject)
+ return E_INVALIDARG;
+
if ( IsEqualGUID( riid, &IID_IUnknown ) ||
IsEqualGUID( riid, &IID_IDispatch ) ||
IsEqualGUID( riid, &IID_IXMLDOMNodeList ) )
@@ -255,6 +258,9 @@ static HRESULT WINAPI queryresult_get_item(
TRACE("%p %ld\n", This, index);
+ if(!listItem)
+ return E_INVALIDARG;
+
*listItem = NULL;
if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval))
@@ -274,6 +280,9 @@ static HRESULT WINAPI queryresult_get_length(
TRACE("%p\n", This);
+ if(!listLength)
+ return E_INVALIDARG;
+
*listLength = xmlXPathNodeSetGetLength(This->result->nodesetval);
return S_OK;
}
@@ -286,6 +295,9 @@ static HRESULT WINAPI queryresult_nextNode(
TRACE("%p %p\n", This, nextItem );
+ if(!nextItem)
+ return E_INVALIDARG;
+
*nextItem = NULL;
if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval))
More information about the wine-cvs
mailing list