[1/3] msxml3: Protect from null pointer in load()
Nikolay Sivov
nsivov at codeweavers.com
Mon Jul 16 04:10:42 CDT 2012
Protect from null pointer in load()
-------------- next part --------------
>From 854a8030c41d0c7e38fd463d46a313a157c43f70 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat, 14 Jul 2012 22:52:35 +0400
Subject: [PATCH 4/5] Protect from null pointer in load()
---
dlls/msxml3/domdoc.c | 1 +
dlls/msxml3/tests/domdoc.c | 7 +++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index cbbebf2..0f3eb50 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -2093,6 +2093,7 @@ static HRESULT WINAPI domdoc_load(
}
break;
case VT_UNKNOWN:
+ if (!V_UNKNOWN(&source)) return E_INVALIDARG;
hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc);
if(hr == S_OK)
{
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 46b628f..dfa6126 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -10749,6 +10749,13 @@ static void test_load(void)
doc = create_document(&IID_IXMLDOMDocument);
+ /* null pointer as input */
+ V_VT(&src) = VT_UNKNOWN;
+ V_UNKNOWN(&src) = NULL;
+ hr = IXMLDOMDocument_load(doc, src, &b);
+ EXPECT_HR(hr, E_INVALIDARG);
+ ok(b == VARIANT_FALSE, "got %d\n", b);
+
path = _bstr_("test.xml");
/* load from path: VT_BSTR */
--
1.5.6.5
More information about the wine-patches
mailing list