From c2d703ea5d7306247caea39bc96a9c8dae03706f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 24 Jun 2015 09:09:15 +0200 Subject: [PATCH] launch_daemon: Make sure conditions are properly deleted. --- src/servers/launch/BaseJob.cpp | 6 ++++++ src/servers/launch/BaseJob.h | 1 + src/servers/launch/Conditions.cpp | 2 ++ 3 files changed, 9 insertions(+) diff --git a/src/servers/launch/BaseJob.cpp b/src/servers/launch/BaseJob.cpp index 50398552bd..2dbec44a1d 100644 --- a/src/servers/launch/BaseJob.cpp +++ b/src/servers/launch/BaseJob.cpp @@ -17,6 +17,12 @@ BaseJob::BaseJob(const char* name) } +BaseJob::~BaseJob() +{ + delete fCondition; +} + + const char* BaseJob::Name() const { diff --git a/src/servers/launch/BaseJob.h b/src/servers/launch/BaseJob.h index f4108140be..df08964b29 100644 --- a/src/servers/launch/BaseJob.h +++ b/src/servers/launch/BaseJob.h @@ -18,6 +18,7 @@ class ConditionContext; class BaseJob : public BJob { public: BaseJob(const char* name); + ~BaseJob(); const char* Name() const; diff --git a/src/servers/launch/Conditions.cpp b/src/servers/launch/Conditions.cpp index 6611f30aad..8c6c09c1de 100644 --- a/src/servers/launch/Conditions.cpp +++ b/src/servers/launch/Conditions.cpp @@ -119,6 +119,8 @@ Condition::~Condition() ConditionContainer::ConditionContainer(const BMessage& args) + : + fConditions(10, true) { char* name; type_code type;