=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: msi: Fix leaks in stop_service_dependents (coverity).
Alexandre Julliard
julliard at winehq.org
Fri Nov 16 13:12:52 CST 2012
Module: wine
Branch: master
Commit: cac26d47a0400788de4782691780f2db1aa04eb9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac26d47a0400788de4782691780f2db1aa04eb9
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Fri Nov 16 11:50:27 2012 +0100
msi: Fix leaks in stop_service_dependents (coverity).
---
dlls/msi/action.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 833bc67..2bf0ed5 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -6043,6 +6043,7 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service)
ENUM_SERVICE_STATUSW *dependencies;
SERVICE_STATUS ss;
SC_HANDLE depserv;
+ BOOL stopped, ret = FALSE;
if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL,
0, &needed, &count))
@@ -6057,24 +6058,26 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service)
if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies,
needed, &needed, &count))
- goto error;
+ goto done;
for (i = 0; i < count; i++)
{
depserv = OpenServiceW(scm, dependencies[i].lpServiceName,
SERVICE_STOP | SERVICE_QUERY_STATUS);
if (!depserv)
- goto error;
+ goto done;
- if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss))
- goto error;
+ stopped = ControlService(depserv, SERVICE_CONTROL_STOP, &ss);
+ CloseServiceHandle(depserv);
+ if (!stopped)
+ goto done;
}
- return TRUE;
+ ret = TRUE;
-error:
+done:
msi_free(dependencies);
- return FALSE;
+ return ret;
}
static UINT stop_service( LPCWSTR name )
More information about the wine-cvs
mailing list