Michael Stefaniuc : oleaut32: Plug some memleaks on error paths (Smatch).
Alexandre Julliard
julliard at winehq.org
Wed Mar 17 12:19:05 CDT 2010
Module: wine
Branch: master
Commit: 0346eac906cc437db78698ba362bc2ba19b44b97
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0346eac906cc437db78698ba362bc2ba19b44b97
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Mar 16 23:05:47 2010 +0100
oleaut32: Plug some memleaks on error paths (Smatch).
---
dlls/oleaut32/typelib2.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index ec3ec1c..08b8684 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -2482,8 +2482,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
for(iter2=This->typedata->next->next; iter2!=This->typedata->next; iter2=iter2->next) {
if(iter == iter2) continue;
- if(iter2->indice == iter->indice)
+ if(iter2->indice == iter->indice) {
+ HeapFree(GetProcessHeap(), 0, typedata);
return E_ACCESSDENIED;
+ }
}
break;
@@ -2495,15 +2497,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(
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;
+ }
if(user_vft&1) {
if(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;
+ }
} else if(This->typekind != TKIND_MODULE) {
iter->u.data[3] = (iter->u.data[3]&0xffff0000) | This->typeinfo->cbSizeVft;
This->typeinfo->cbSizeVft += 4;
More information about the wine-cvs
mailing list