librbd: fix possible memory leak when image open fails

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index d28f8cad2262a9b54447cfaee054e5681d2812b2..cf4aa916ad2d398de3585e50b08691c12b52c5a2 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -910,13 +910,15 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
        if (r < 0) {
          lderr(cct) << "error opening image: "
                     << cpp_strerror(r) << dendl;
+          delete imctx;
          return r;
        }
        librbd::NoOpProgressContext prog_ctx;
        r = imctx->operations->flatten(prog_ctx);
        if (r < 0) {
-         lderr(cct) << "error to flatten image: " << pool << "/" << id_it
+         lderr(cct) << "error flattening image: " << pool << "/" << id_it
                     << cpp_strerror(r) << dendl;
+          imctx->state->close();
          return r;
        }
 
@@ -939,7 +941,7 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
       pctx.update_progress(++i, size);
       assert(i <= size);
     }
-    
+
     return 0;
   }