From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 11 Jan 2016 09:05:37 +0000 (+0800)
Subject: RBD: fix potential memory leak
X-Git-Tag: v10.0.3~60^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3df756c371723795ecf9e4d9e18c31adfa1cc04a;p=ceph.git

RBD: fix potential memory leak

Fixes: #14332
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index d29a4ca96c3d..9368bceed476 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1528,6 +1528,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     if (r < 0) {
       lderr(cct) << "error opening parent image: "
 		 << cpp_strerror(-r) << dendl;
+      delete p_imctx;
       return r;
     }
 
@@ -1579,6 +1580,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     r = c_imctx->state->open();
     if (r < 0) {
       lderr(cct) << "Error opening new image: " << cpp_strerror(r) << dendl;
+      delete c_imctx;
       goto err_remove;
     }
 
@@ -1658,6 +1660,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     if (r < 0) {
       lderr(ictx->cct) << "error opening source image: " << cpp_strerror(r)
 		       << dendl;
+      delete ictx;
       return r;
     }
     BOOST_SCOPE_EXIT((ictx)) {
@@ -2031,6 +2034,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     int r = ictx->state->open();
     if (r < 0) {
       ldout(cct, 2) << "error opening image: " << cpp_strerror(-r) << dendl;
+      delete ictx;
     } else {
       string header_oid = ictx->header_oid;
       old_format = ictx->old_format;
@@ -2374,6 +2378,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
 					  dest_md_ctx, false);
     r = dest->state->open();
     if (r < 0) {
+      delete dest;
       lderr(cct) << "failed to read newly created header" << dendl;
       return r;
     }