From 108475decfde8fd30818c37604ef8db837220624 Mon Sep 17 00:00:00 2001
From: Vijay Bellur <vbellur@redhat.com>
Date: Sun, 7 Apr 2013 21:39:18 +0530
Subject: cli: Address a double free with volume info.

Crash is observed when volume info is performed on a
non-exisiting volume name and the output format is xml.

Change-Id: I88aa5d9dc954b1352f5cc3b5b38742c832bc1bb8
BUG: 949298
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/4785
Reviewed-by: Kaushal M <kaushal@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 cli/src/cli-xml-output.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cli')

diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index 543ea713..72e1264f 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -2495,12 +2495,12 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict)
                 ret = xmlTextWriterEndElement (local->writer);
                 XML_RET_CHECK_AND_GOTO (ret, out);
         }
-        GF_FREE (local->get_vol.volname);
+
         if (volname) {
+                GF_FREE (local->get_vol.volname);
                 local->get_vol.volname = gf_strdup (volname);
                 local->vol_count += count;
         }
-
 out:
         gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret);
         return ret;
-- 
cgit