Attachment 501425 Details for Bug 708435 – Fix to dupe strings when collecting job summaries

[patch] Fix to dupe strings when collecting job summaries

0001-Fix-for-missing-summary-strings-in-qmf-contrib-job-s.patch (text/plain), 1.96 KB, created by Pete MacKinnon on 2011-05-27 22:59:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete MacKinnon

Created: 2011-05-27 22:59:53 UTC

Size: 1.96 KB

patch

obsolete

>From e5ecb6009e425e7399e5883bbed740a73c1adace Mon Sep 17 00:00:00 2001
>From: Peter MacKinnon <pmackinn@redhat.com>
>Date: Fri, 27 May 2011 18:38:43 -0400
>Subject: [PATCH] Fix for missing summary strings in qmf contrib job server
>
>---
> src/condor_contrib/mgmt/qmf/daemons/Job.cpp        |    3 ++-
> .../mgmt/qmf/daemons/JobServerJobLogConsumer.cpp   |    4 ++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/src/condor_contrib/mgmt/qmf/daemons/Job.cpp b/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>index 592e5f5..5af0978 100644
>--- a/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>+++ b/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>@@ -81,6 +81,7 @@ Attribute::Attribute ( AttributeType _type, const char *_value ) :
> 
> Attribute::~Attribute()
> {
>+    delete [] m_value;
> }
> 
> Attribute::AttributeType
>@@ -185,7 +186,7 @@ LiveJobImpl::Get ( const char *_name, const Attribute *&_attribute ) const
>             {
>                 return false;
>             }
>-            _attribute = new Attribute ( Attribute::STRING_TYPE, str.Value() );
>+            _attribute = new Attribute ( Attribute::STRING_TYPE, str.StrDup() );
>             return true;
>         }
>         default:
>diff --git a/src/condor_contrib/mgmt/qmf/daemons/JobServerJobLogConsumer.cpp b/src/condor_contrib/mgmt/qmf/daemons/JobServerJobLogConsumer.cpp
>index 7eb7342..0bddf0b 100644
>--- a/src/condor_contrib/mgmt/qmf/daemons/JobServerJobLogConsumer.cpp
>+++ b/src/condor_contrib/mgmt/qmf/daemons/JobServerJobLogConsumer.cpp
>@@ -84,8 +84,6 @@ JobServerJobLogConsumer::NewClassAd(const char *_key,
> 									const char */*target*/)
> {
> 
>-	const char* key_dup = strdup(_key);
>-
> 	dprintf(D_FULLDEBUG, "JobServerJobLogConsumer::NewClassAd processing _key='%s'\n", _key);
> 
> 	// ignore the marker
>@@ -93,6 +91,8 @@ JobServerJobLogConsumer::NewClassAd(const char *_key,
> 	  return true;
> 	}
> 
>+	const char* key_dup = strdup(_key);
>+
> 	if ('0' == _key[0]) {
> 		// Cluster ad
> 		if (g_jobs.end() == g_jobs.find(_key)) {
>-- 
>1.7.4.4
>

Actions: View | Diff

Attachments on bug 708435: 501425 | 502086