cluster: RHEL5 - rgmanager: Don't push NULL on to the S/Lang stack

Lon Hohberger lon@fedoraproject.org
Mon Jun 22 18:48:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9ca813337c7173e3889dc31986f3fc906a7c66c5
Commit:        9ca813337c7173e3889dc31986f3fc906a7c66c5
Parent:        09b0c9418c4d8165e897e6a3d2e8fac17d7de046
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Mon Jun 22 14:14:53 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 14:16:57 2009 -0400

rgmanager: Don't push NULL on to the S/Lang stack

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/slang_event.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c
index 4f52041..86625c6 100644
--- a/rgmanager/src/daemons/slang_event.c
+++ b/rgmanager/src/daemons/slang_event.c
@@ -449,8 +449,15 @@ sl_service_property(char *svcName, char *prop)
 	if (get_service_property(svcName, prop, buf, sizeof(buf)) < 0)
 		return;
 
-	/* does this work or do I have to push a malloce'd string? */
 	ret = strdup(buf);
+	if (!ret) {
+		SLang_verror(SL_RunTime_Error,
+			     (char *)"%s: Failed to duplicate state of %s",
+			     __FUNCTION__,
+			     svcName);
+		return;
+	}
+
 	if (SLang_push_malloced_string(ret) < 0) {
 		SLang_verror(SL_RunTime_Error,
 			     (char *)"%s: Failed to push %s property of %s",



More information about the Cluster-cvs mailing list