reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-04-04 00:51:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Some missing error checking in FileMonikerImpl_CommonPrefixWith (Coverity).

Browse Source
This commit is contained in:
Marcus Meissner 2009-11-23 22:23:36 +01:00 committed by Alexandre Julliard
parent 1667a2469e
commit 000e1e0ce0
1 changed files with 15 additions and 3 deletions

18
dlls/ole32/filemoniker.c

@ -960,20 +960,32 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p
if(mkSys==MKSYS_FILEMONIKER){ if(mkSys==MKSYS_FILEMONIKER){
HRESULT ret; HRESULT ret;
CreateBindCtx(0,&pbind); ret = CreateBindCtx(0,&pbind);
if (FAILED(ret))
return ret;
/* create a string based on common part of the two paths */ /* create a string based on common part of the two paths */
IMoniker_GetDisplayName(iface,pbind,NULL,&pathThis); ret = IMoniker_GetDisplayName(iface,pbind,NULL,&pathThis);
IMoniker_GetDisplayName(pmkOther,pbind,NULL,&pathOther); if (FAILED(ret))
return ret;
ret = IMoniker_GetDisplayName(pmkOther,pbind,NULL,&pathOther);
if (FAILED(ret))
return ret;
nb1=FileMonikerImpl_DecomposePath(pathThis,&stringTable1); nb1=FileMonikerImpl_DecomposePath(pathThis,&stringTable1);
if (FAILED(nb1))
return nb1;
nb2=FileMonikerImpl_DecomposePath(pathOther,&stringTable2); nb2=FileMonikerImpl_DecomposePath(pathOther,&stringTable2);
if (FAILED(nb2))
return nb2;
if (nb1==0 || nb2==0) if (nb1==0 || nb2==0)
return MK_E_NOPREFIX; return MK_E_NOPREFIX;
commonPath=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1)); commonPath=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1));
if (!commonPath)
return E_OUTOFMEMORY;
*commonPath=0; *commonPath=0;