From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 5 Sep 2017 16:11:45 +0000 (-0400)
Subject: librbd: rename of non-existent image results in seg fault
X-Git-Tag: v12.2.1~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17556%2Fhead;p=ceph.git

librbd: rename of non-existent image results in seg fault

Fixes: http://tracker.ceph.com/issues/21248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4a75ee43d3b108a9593a010160479fd62884eda8)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 70c706c6d4b..5977231bdd5 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -970,8 +970,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     ImageCtx *ictx = new ImageCtx(srcname, "", "", io_ctx, false);
     int r = ictx->state->open(false);
     if (r < 0) {
-      lderr(ictx->cct) << "error opening source image: " << cpp_strerror(r)
-		       << dendl;
+      lderr(cct) << "error opening source image: " << cpp_strerror(r) << dendl;
       return r;
     }
     BOOST_SCOPE_EXIT((ictx)) {