diff options
| author | Xiaowei Chen <cxwshawn@gmail.com> | 2015-09-08 12:58:57 +0200 |
|---|---|---|
| committer | Xiaowei Chen <cxwshawn@gmail.com> | 2015-09-08 12:59:00 +0200 |
| commit | ab4232baa7bcc86e90746e13312ac9bda1772872 (patch) | |
| tree | f2e772b08e90f1448a6ec67266b6a24b272621af /src/rgw | |
| parent | Merge pull request #5652 from dachary/wip-mailmap (diff) | |
| download | ceph-ab4232baa7bcc86e90746e13312ac9bda1772872.tar.xz ceph-ab4232baa7bcc86e90746e13312ac9bda1772872.zip | |
rgw: init_rados failed leads to repeated delete
Fixes: #12978
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
Diffstat (limited to 'src/rgw')
| -rw-r--r-- | src/rgw/rgw_rados.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index c23a2db3ee7..70e806b08ae 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1508,10 +1508,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; |