oleaut32: Plug some memleaks on error paths (Smatch).
This commit is contained in:
parent
c71b82f3c1
commit
0346eac906
|
@ -2482,9 +2482,11 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
|
||||||
|
|
||||||
for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) {
|
for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) {
|
||||||
if(iter == iter2) continue;
|
if(iter == iter2) continue;
|
||||||
if(iter2->indice == iter->indice)
|
if(iter2->indice == iter->indice) {
|
||||||
|
HeapFree(GetProcessHeap(), 0, typedata);
|
||||||
return E_ACCESSDENIED;
|
return E_ACCESSDENIED;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -2495,15 +2497,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
|
||||||
|
|
||||||
iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16);
|
iter->u.data[0] = (iter->u.data[0]&0xffff) | (i<<16);
|
||||||
|
|
||||||
if((iter->u.data[3]&1) != (user_vft&1))
|
if((iter->u.data[3]&1) != (user_vft&1)) {
|
||||||
|
HeapFree(GetProcessHeap(), 0, typedata);
|
||||||
return TYPE_E_INVALIDID;
|
return TYPE_E_INVALIDID;
|
||||||
|
}
|
||||||
|
|
||||||
if(user_vft&1) {
|
if(user_vft&1) {
|
||||||
if(user_vft < (iter->u.data[3]&0xffff))
|
if(user_vft < (iter->u.data[3]&0xffff))
|
||||||
user_vft = (iter->u.data[3]&0xffff);
|
user_vft = (iter->u.data[3]&0xffff);
|
||||||
|
|
||||||
if((iter->u.data[3]&0xffff) < This->typeinfo->cbSizeVft)
|
if((iter->u.data[3]&0xffff) < This->typeinfo->cbSizeVft) {
|
||||||
|
HeapFree(GetProcessHeap(), 0, typedata);
|
||||||
return TYPE_E_INVALIDID;
|
return TYPE_E_INVALIDID;
|
||||||
|
}
|
||||||
} else if(This->typekind != TKIND_MODULE) {
|
} else if(This->typekind != TKIND_MODULE) {
|
||||||
iter->u.data[3] = (iter->u.data[3]&0xffff0000) | This->typeinfo->cbSizeVft;
|
iter->u.data[3] = (iter->u.data[3]&0xffff0000) | This->typeinfo->cbSizeVft;
|
||||||
This->typeinfo->cbSizeVft += 4;
|
This->typeinfo->cbSizeVft += 4;
|
||||||
|
|
Loading…
Reference in New Issue