From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4832 invoked by alias); 22 Jun 2009 18:25:50 -0000 Received: (qmail 4817 invoked by alias); 22 Jun 2009 18:25:50 -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: Don't push NULL on to the S/Lang stack 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: 6c7d63d837b04470ebfadfd390c7ce7ec8d75010 X-Git-Newrev: f2840814ddf827d84cb0134fa7b7d4bd07c5ef9e From: Lon Hohberger Message-Id: <20090622182404.8CF2B1201D4@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 18:25: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/msg00678.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f2840814ddf827d84cb0134fa7b7d4bd07c5ef9e Commit: f2840814ddf827d84cb0134fa7b7d4bd07c5ef9e Parent: 6c7d63d837b04470ebfadfd390c7ce7ec8d75010 Author: Lon Hohberger AuthorDate: Mon Jun 22 14:14:53 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 14:24:01 2009 -0400 rgmanager: Don't push NULL on to the S/Lang stack Signed-off-by: Lon Hohberger --- 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 3f93039..aa93abd 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -424,8 +424,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",