Andrew Talbot : dplayx: Fix some memory leaks.
Alexandre Julliard
julliard at winehq.org
Mon Sep 24 08:07:58 CDT 2007
Module: wine
Branch: master
Commit: 5ab977e2aad3c5a28f1ad46b3928ca113f7c748c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab977e2aad3c5a28f1ad46b3928ca113f7c748c
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Sep 22 15:40:15 2007 +0100
dplayx: Fix some memory leaks.
---
dlls/dplayx/dplay.c | 7 +++++++
dlls/dplayx/name_server.c | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 1688614..27e17c2 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -3727,8 +3727,10 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
+ RegCloseKey(hkServiceProvider);
continue;
}
+ RegCloseKey(hkServiceProvider);
/* FIXME: Check return types to ensure we're interpreting data right */
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
@@ -3822,8 +3824,10 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
ERR(": missing GUID registry data members\n" );
+ RegCloseKey(hkServiceProvider);
continue;
}
+ RegCloseKey(hkServiceProvider);
/* FIXME: Check return types to ensure we're interpreting data right */
MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) );
@@ -3861,6 +3865,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
&dwAddressBufferSize, TRUE ) ) != DP_OK )
{
ERR( "can't create address: %s\n", DPLAYX_HresultToString( hr ) );
+ HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
return hr;
}
@@ -3868,8 +3873,10 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize,
&dpName, DPCONNECTION_DIRECTPLAYLOBBY, lpContext ) )
{
+ HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
return DP_OK;
}
+ HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
}
}
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index e875c19..1fdfef6 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -136,6 +136,7 @@ void NS_AddRemoteComputerAsNameServer( LPCVOID lpcNSAddrHdr
if( lpCacheNode->data == NULL )
{
ERR( "no memory for SESSIONDESC2\n" );
+ HeapFree( GetProcessHeap(), 0, lpCacheNode );
return;
}
More information about the wine-cvs
mailing list