Dmitry Timoshkov : mstask: ITaskTrigger::GetTrigger() should fail on NULL input.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 999922f7f326dae4ed5ad664006d2f380ba89e35
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=999922f7f326dae4ed5ad664006d2f380ba89e35

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon May 14 15:49:20 2018 +0800

mstask: ITaskTrigger::GetTrigger() should fail on NULL input.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mstask/task_trigger.c       | 2 ++
 dlls/mstask/tests/task_trigger.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c
index 6d11817..0f24e1f 100644
--- a/dlls/mstask/task_trigger.c
+++ b/dlls/mstask/task_trigger.c
@@ -211,6 +211,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_GetTrigger(
 
     TRACE("(%p, %p)\n", iface, pTrigger);
 
+    if (!pTrigger) return E_INVALIDARG;
+
     /* Native implementation doesn't verify equivalent cbTriggerSize fields */
 
     /* Copy relevant fields of the structure */
diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c
index e22b2ae..fe757e8 100644
--- a/dlls/mstask/tests/task_trigger.c
+++ b/dlls/mstask/tests/task_trigger.c
@@ -139,6 +139,9 @@ static void test_SetTrigger_GetTrigger(void)
     hres = ITaskTrigger_SetTrigger(test_trigger, NULL);
     ok(hres == E_INVALIDARG, "got %#x\n", hres);
 
+    hres = ITaskTrigger_GetTrigger(test_trigger, NULL);
+    ok(hres == E_INVALIDARG, "got %#x\n", hres);
+
     /* Setup a trigger with base values for this test run */
     GetLocalTime(&time);
     empty_trigger_state.wStartHour = time.wHour;