From 297c04d856c4864d21b2241ad01560afa61dde40 Mon Sep 17 00:00:00 2001 From: Xiaowei Chen Date: Tue, 8 Sep 2015 06:58:57 -0400 Subject: [PATCH] rgw: init_rados failed leads to repeated delete Fixes: #12978 Signed-off-by: Xiaowei Chen (cherry picked from commit ab4232baa7bcc86e90746e13312ac9bda1772872) --- src/rgw/rgw_rados.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index e71f6a2a65161..f439aeab11da9 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; -- 2.39.5