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

Deal with the case of loading an empty PIDL from a stream better in 

ILLoadFromStream.
This commit is contained in:
Mike Hearn 2003-07-22 01:00:47 +00:00 committed by Alexandre Julliard
parent 0ab73312c8
commit 72d8aa5ec2
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/shell32/pidl.c
View File

@ -279,25 +279,35 @@ HRESULT WINAPI ILLoadFromStream (IStream * pStream, LPITEMIDLIST * ppPidl)
IStream_AddRef (pStream); IStream_AddRef (pStream);
if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead))) if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead)))
{ *ppPidl = SHAlloc (wLen); {
if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) TRACE("PIDL length is %d\n", wLen);
{ ret = S_OK; if (wLen != 0) {
} *ppPidl = SHAlloc (wLen);
else if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead))) {
{ SHFree(*ppPidl); TRACE("Stream read OK\n");
ret = S_OK;
} else {
WARN("reading pidl failed\n");
SHFree(*ppPidl);
*ppPidl = NULL;
}
} else {
*ppPidl = NULL; *ppPidl = NULL;
ret = S_OK;
} }
} }
/* we are not yet fully compatible */ /* we are not yet fully compatible */
if (!pcheck(*ppPidl)) if (*ppPidl && !pcheck(*ppPidl))
{ SHFree(*ppPidl); {
WARN("Check failed\n");
SHFree(*ppPidl);
*ppPidl = NULL; *ppPidl = NULL;
} }
IStream_Release (pStream); IStream_Release (pStream);
TRACE("done\n");
return ret; return ret;
} }