quartz: Add check for NULL pointer in FileSource_Load.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz: Add check for NULL pointer in FileSource_Load.
b28a8a31 · Sebastian Lackner · Alexandre Julliard · 610d6b45 · b28a8a31 · b28a8a31
Commit b28a8a31 authored Apr 28, 2016 by Sebastian Lackner Committed by Alexandre Julliard Apr 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

filesource.c dlls/quartz/filesource.c +3 -0

avisplitter.c dlls/quartz/tests/avisplitter.c +0 -1

No files found.
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -613,6 +613,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi

    TRACE("(%s, %p)\n", debugstr_w(pszFileName), pmt);

+    if (!pszFileName)
+        return E_POINTER;
+
    /* open file */
    /* FIXME: check the sharing values that native uses */
    hFile = CreateFileW(pszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);

--- a/dlls/quartz/tests/avisplitter.c
+++ b/dlls/quartz/tests/avisplitter.c
@@ -252,7 +252,6 @@ static void test_filesourcefilter(void)
        ok(olepath == NULL, "expected NULL, got %p\n", olepath);

        hr = IFileSourceFilter_Load(filesource, NULL, NULL);
-        todo_wine
        ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr);

        hr = IFileSourceFilter_Load(filesource, path, NULL);