Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > e536fc0c6270ec1d92a0fd41bb1f8360 > files > 14

rgmanager-2.0.52-28.el5_8.2.src.rpm

From 0500b5311a809ea119599488374ef094b633f1d5 Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Mon, 22 Jun 2009 14:14:53 -0400
Subject: [PATCH] rgmanager: Don't push NULL on to the S/Lang stack

Resolves: bz507431

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 b3273ac..a9b69ab 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",
-- 
1.6.2.5