quartz: Properly handle input parameters in FileSource_GetCurFile.

0885141c · Chris Robinson · Alexandre Julliard · b90a665d · 0885141c
Commit 0885141c authored Feb 13, 2007 by Chris Robinson Committed by Alexandre Julliard Feb 14, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

filesource.c dlls/quartz/filesource.c +8 -4

No files found.
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -637,6 +637,9 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR 
    
    TRACE("(%p, %p)\n", ppszFileName, pmt);

+    if (!ppszFileName)
+        return E_POINTER;
+
    /* copy file name & media type if available, otherwise clear the outputs */
    if (This->pszFileName)
    {
@@ -646,12 +649,13 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR 
    else
        *ppszFileName = NULL;

-    if (This->pmt)
+    if (pmt)
    {
-        CopyMediaType(pmt, This->pmt);
+        if (This->pmt)
+            CopyMediaType(pmt, This->pmt);
+        else
+            ZeroMemory(pmt, sizeof(*pmt));
    }
-    else
-        ZeroMemory(pmt, sizeof(*pmt));

    return S_OK;
 }