ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Correctly fix IStream::Read.

Browse Source 
Don't dereference a possible NULL pointer.
This commit is contained in:
Thomas Weidenmueller 2005-12-12 11:49:29 +01:00 committed by Alexandre Julliard
parent c26ad82e75
commit ac459e7ea0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/urlmon/umstream.c
View File

@ -225,7 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface,
ULONG cb, ULONG cb,
ULONG* pcbRead) ULONG* pcbRead)
{ {
DWORD dwBytesRead; ULONG dwBytesRead;
IUMCacheStream *This = (IUMCacheStream *)iface; IUMCacheStream *This = (IUMCacheStream *)iface;
TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
@ -233,7 +233,10 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface,
if ( !pv ) if ( !pv )
return STG_E_INVALIDPOINTER; 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; return S_FALSE;
if (!*pcbRead) if (!*pcbRead)