From: Xiaowei Chen <cxwshawn@gmail.com>
Date: Tue, 8 Sep 2015 10:58:57 +0000 (-0400)
Subject: rgw: init_rados failed leads to repeated delete
X-Git-Tag: v0.94.4~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=297c04d856c4864d21b2241ad01560afa61dde40;p=ceph.git

rgw: init_rados failed leads to repeated delete

Fixes: #12978

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit ab4232baa7bcc86e90746e13312ac9bda1772872)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index e71f6a2a651..f439aeab11d 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1504,10 +1504,13 @@ fail:
   for (uint32_t i=0; i < num_rados_handles; i++) {
     if (rados[i]) {
       delete rados[i];
+      rados[i] = NULL;
     }
   }
+  num_rados_handles = 0;
   if (rados) {
     delete[] rados;
+    rados = NULL;
   }
 
   return ret;