From 01f2d4370766dbb5123ad6be54de46e97ebf189f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 26 Aug 2013 12:29:19 +0200
Subject: [PATCH] Bug #2281: Fix DS monitoring parse error crash (cherry picked
 from commit 9d9e9d7ca6eb8f3bc95558474f291c9c3e8feb8d)

---
 src/image/ImageManagerDriver.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/image/ImageManagerDriver.cc b/src/image/ImageManagerDriver.cc
index 60871d7ce0..ace0c93a17 100644
--- a/src/image/ImageManagerDriver.cc
+++ b/src/image/ImageManagerDriver.cc
@@ -622,8 +622,6 @@ static void monitor_action(istringstream& is,
     char*  error_msg;
     int    rc = monitor_data.parse(*dsinfo, &error_msg);
 
-    delete dsinfo;
-
     if ( rc != 0 )
     {
         oss << "Error parsing datastore information: " << error_msg
@@ -631,11 +629,14 @@ static void monitor_action(istringstream& is,
 
         NebulaLog::log("ImM", Log::ERROR, oss);
 
+        delete dsinfo;
         free(error_msg);
 
         return;
     }
 
+    delete dsinfo;
+
     float  total, free, used;
     string ds_name;