public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: rgmanager: master - rgmanager: Fix small memory leak
Date: Mon, 22 Jun 2009 16:55:00 -0000	[thread overview]
Message-ID: <20090622165446.02BB61201D4@lists.fedorahosted.org> (raw)

Gitweb:        http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=d1b70a1c3e5c6a962061c9f7c181ccecb050d30e
Commit:        d1b70a1c3e5c6a962061c9f7c181ccecb050d30e
Parent:        10f9c02038d1086287f1322287a65101c98828e9
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Fri Jun 19 22:59:53 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 12:52:44 2009 -0400

rgmanager: Fix small memory leak

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 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,


                 reply	other threads:[~2009-06-22 16:55 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090622165446.02BB61201D4@lists.fedorahosted.org \
    --to=lon@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).