Dmitry Timoshkov : taskschd: Add a NULL check to ITaskFolder::GetFolders.

Alexandre Julliard julliard at winehq.org
Thu Feb 6 13:25:31 CST 2014


Module: wine
Branch: master
Commit: 9c7025f92fb7bc0ac0235a1e5b7aeaabe38c6cd6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9c7025f92fb7bc0ac0235a1e5b7aeaabe38c6cd6

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Wed Feb  5 15:08:32 2014 +0900

taskschd: Add a NULL check to ITaskFolder::GetFolders.

---

 dlls/taskschd/folder.c          |    2 ++
 dlls/taskschd/tests/scheduler.c |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c
index 8d8a1a3..0618c23 100644
--- a/dlls/taskschd/folder.c
+++ b/dlls/taskschd/folder.c
@@ -236,6 +236,8 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas
 
     TRACE("%p,%x,%p: stub\n", iface, flags, folders);
 
+    if (!folders) return E_POINTER;
+
     if (flags)
         FIXME("unsupported flags %x\n", flags);
 
diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c
index be36069..df00eb2 100644
--- a/dlls/taskschd/tests/scheduler.c
+++ b/dlls/taskschd/tests/scheduler.c
@@ -453,6 +453,9 @@ static void test_FolderCollection(void)
     hr = ITaskFolder_GetFolder(root, Wine, &folder);
     ok(hr == S_OK, "GetFolder error %#x\n", hr);
 
+    hr = ITaskFolder_GetFolders(folder, 0, NULL);
+    ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);
+
     hr = ITaskFolder_GetFolders(folder, 0, &folders);
     ok(hr == S_OK, "GetFolders error %#x\n", hr);
 




More information about the wine-cvs mailing list