Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A365518384 for ; Tue, 3 Nov 2015 15:04:28 +0000 (UTC) Received: (qmail 15365 invoked by uid 500); 3 Nov 2015 15:04:28 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 15332 invoked by uid 500); 3 Nov 2015 15:04:28 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 15286 invoked by uid 99); 3 Nov 2015 15:04:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2015 15:04:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A948E02D3; Tue, 3 Nov 2015 15:04:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Date: Tue, 03 Nov 2015 15:04:30 -0000 Message-Id: <7a7d23dfd1044a7782275109282bc934@git.apache.org> In-Reply-To: <1851ff8465ca4de39c1798f30c133268@git.apache.org> References: <1851ff8465ca4de39c1798f30c133268@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] celix git commit: CELIX-269: Removed double free from calculator shell for remote services test CELIX-269: Removed double free from calculator shell for remote services test Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/a0f2217a Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/a0f2217a Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/a0f2217a Branch: refs/heads/develop Commit: a0f2217a08be60737b0c2a63e7899159d07dcc1d Parents: 9441ac2 Author: Pepijn Noltes Authored: Tue Nov 3 13:34:58 2015 +0100 Committer: Pepijn Noltes Committed: Tue Nov 3 13:34:58 2015 +0100 ---------------------------------------------------------------------- .../private/src/calculator_shell_activator.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/a0f2217a/remote_services/examples/calculator_shell/private/src/calculator_shell_activator.c ---------------------------------------------------------------------- diff --git a/remote_services/examples/calculator_shell/private/src/calculator_shell_activator.c b/remote_services/examples/calculator_shell/private/src/calculator_shell_activator.c index ddbe842..29fb49e 100644 --- a/remote_services/examples/calculator_shell/private/src/calculator_shell_activator.c +++ b/remote_services/examples/calculator_shell/private/src/calculator_shell_activator.c @@ -114,13 +114,7 @@ celix_status_t bundleActivator_stop(void * userData, bundle_context_pt context) free(activator->addCmdSrv); free(activator->subCmdSrv); free(activator->sqrtCmdSrv); - - if (status == CELIX_SUCCESS) { - free(activator->addCmdSrv); - free(activator->sqrtCmdSrv); - free(activator->subCmdSrv); - } - + return status; }