From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 13 May 2013 09:50:37 +0000 (+0200)
Subject: ceph-filestore-dump.cc: cleanup on error case
X-Git-Tag: v0.63~29^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=349cfb41d0d440338e14a788793230c546295743;p=ceph.git

ceph-filestore-dump.cc: cleanup on error case

CID 1019589 (#1 of 1): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "t" going out of scope leaks the
  storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/tools/ceph-filestore-dump.cc b/src/tools/ceph-filestore-dump.cc
index 5587ef4dcff6..1c09de6c0a33 100644
--- a/src/tools/ceph-filestore-dump.cc
+++ b/src/tools/ceph-filestore-dump.cc
@@ -357,7 +357,7 @@ void remove_coll(ObjectStore *store, const coll_t &coll)
     r = store->collection_list_partial(coll, next, 200, 300, 0,
       &objects, &next);
     if (r < 0)
-      return;
+      goto out;
     for (vector<hobject_t>::iterator i = objects.begin();
 	 i != objects.end();
 	 ++i, ++num) {
@@ -380,6 +380,7 @@ void remove_coll(ObjectStore *store, const coll_t &coll)
   }
   t->remove_collection(coll);
   store->apply_transaction(*t);
+out:
   delete t;
 }