Attachment 502086 Details for Bug 708435 – Additional fix for GetStatus string deletion leading to crash

[patch] Additional fix for GetStatus string deletion leading to crash

0002-Fix-for-GetStatus-crash-in-qmf-contrib-job-server.patch (text/plain), 1.87 KB, created by Pete MacKinnon on 2011-05-31 19:52:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete MacKinnon

Created: 2011-05-31 19:52:07 UTC

Size: 1.87 KB

patch

obsolete

>From bb83d8c4f70a2b452f139bd60e3c7fb5f28877b9 Mon Sep 17 00:00:00 2001
>From: Peter MacKinnon <pmackinn@redhat.com>
>Date: Tue, 31 May 2011 15:44:55 -0400
>Subject: [PATCH 2/2] Fix for GetStatus crash in qmf contrib job server
>
>---
> src/condor_contrib/mgmt/qmf/daemons/Job.cpp |    8 ++++----
> src/condor_contrib/mgmt/qmf/daemons/Job.h   |    2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/src/condor_contrib/mgmt/qmf/daemons/Job.cpp b/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>index 5af0978..6983e0e 100644
>--- a/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>+++ b/src/condor_contrib/mgmt/qmf/daemons/Job.cpp
>@@ -81,7 +81,7 @@ Attribute::Attribute ( AttributeType _type, const char *_value ) :
> 
> Attribute::~Attribute()
> {
>-    delete [] m_value;
>+    //
> }
> 
> Attribute::AttributeType
>@@ -93,7 +93,7 @@ Attribute::GetType() const
> const char *
> Attribute::GetValue() const
> {
>-    return m_value;
>+    return m_value.c_str();
> }
> 
> //////////////
>@@ -181,12 +181,12 @@ LiveJobImpl::Get ( const char *_name, const Attribute *&_attribute ) const
>         }
>         case classad::Value::STRING_VALUE:
>         {
>-            MyString str;
>+            std::string str;
>             if ( !m_full_ad->LookupString ( _name, str ) )
>             {
>                 return false;
>             }
>-            _attribute = new Attribute ( Attribute::STRING_TYPE, str.StrDup() );
>+            _attribute = new Attribute ( Attribute::STRING_TYPE, str.c_str() );
>             return true;
>         }
>         default:
>diff --git a/src/condor_contrib/mgmt/qmf/daemons/Job.h b/src/condor_contrib/mgmt/qmf/daemons/Job.h
>index 55a861f..0537df2 100644
>--- a/src/condor_contrib/mgmt/qmf/daemons/Job.h
>+++ b/src/condor_contrib/mgmt/qmf/daemons/Job.h
>@@ -58,7 +58,7 @@ class Attribute
> 
>     private:
>         AttributeType m_type;
>-        const char * m_value;
>+        std::string m_value;
> };
> 
> 
>-- 
>1.7.4.4
>

Actions: View | Diff

Attachments on bug 708435: 501425 | 502086