urlmon: Correctly fix IStream::Read.

Don't dereference a possible NULL pointer.

urlmon: Correctly fix IStream::Read.
ac459e7e · Thomas Weidenmueller · Alexandre Julliard · c26ad82e · ac459e7e
Commit ac459e7e authored Dec 12, 2005 by Thomas Weidenmueller Committed by Alexandre Julliard Dec 12, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

umstream.c dlls/urlmon/umstream.c +5 -2

No files found.
--- a/dlls/urlmon/umstream.c
+++ b/dlls/urlmon/umstream.c
@@ -225,7 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface,
                                      ULONG cb,
                                      ULONG* pcbRead)
 {
-    DWORD dwBytesRead;
+    ULONG dwBytesRead;
    IUMCacheStream *This = (IUMCacheStream *)iface;

    TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
@@ -233,7 +233,10 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface,
    if ( !pv )
       return STG_E_INVALIDPOINTER;

-    if ( ! ReadFile( This->handle, pv, cb, (pcbRead ? pcbRead : &dwBytesRead), NULL ) )
+    if ( !pcbRead)
+        pcbRead = &dwBytesRead;
+
+    if ( ! ReadFile( This->handle, pv, cb, (LPDWORD)pcbRead, NULL ) )
       return S_FALSE;

    if (!*pcbRead)