From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27070 invoked by alias); 22 Jun 2009 13:47:36 -0000 Received: (qmail 27064 invoked by alias); 22 Jun 2009 13:47:35 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - rgmanager: Fix small memory leak To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 8395896c77cef54c81f8123af1c93a0137465e53 X-Git-Newrev: f4f9663512d77e5388b6a98b454a8d5a369a30c7 From: Lon Hohberger Message-Id: <20090622133334.5F81F1201EF@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 13:47:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00605.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f4f9663512d77e5388b6a98b454a8d5a369a30c7 Commit: f4f9663512d77e5388b6a98b454a8d5a369a30c7 Parent: 8395896c77cef54c81f8123af1c93a0137465e53 Author: Lon Hohberger AuthorDate: Fri Jun 19 22:59:53 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 09:32:04 2009 -0400 rgmanager: Fix small memory leak Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/slang_event.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 1a2b3ac..3f93039 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -415,16 +415,23 @@ out: /** get_service_property(service_name, property) */ -static char * +static void sl_service_property(char *svcName, char *prop) { char buf[96]; + char *ret; if (get_service_property(svcName, prop, buf, sizeof(buf)) < 0) - return NULL; + return; /* does this work or do I have to push a malloce'd string? */ - return strdup(buf); + ret = strdup(buf); + if (SLang_push_malloced_string(ret) < 0) { + SLang_verror(SL_RunTime_Error, + (char *)"%s: Failed to push %s property of %s", + __FUNCTION__, prop, svcName); + free(ret); + } } @@ -959,7 +966,7 @@ static SLang_Intrin_Fun_Type rgmanager_slang[] = MAKE_INTRINSIC_0((char *)"service_list", sl_service_list, SLANG_VOID_TYPE), MAKE_INTRINSIC_SS((char *)"service_property", sl_service_property, - SLANG_STRING_TYPE), + SLANG_VOID_TYPE), MAKE_INTRINSIC_S((char *)"service_domain_info", sl_domain_info, SLANG_VOID_TYPE), MAKE_INTRINSIC_0((char *)"service_stop", sl_stop_service,