librbd: corrected use-after-free in ImageWatcher

Fixes: http://tracker.ceph.com/issues/17289 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
ceph · Sep 17, 2016 · 2f4d486 · 2f4d486
1 parent d5a9d0e
commit 2f4d486
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
@@ -62,9 +62,10 @@ struct C_UnwatchAndFlush : public Context {
     // to completing the callback to avoid racing an explicit
     // librados shutdown
     Context *ctx = on_finish;
+    r = ret_val;
     delete this;
 
-    ctx->complete(ret_val);
+    ctx->complete(r);
   }
 
   virtual void finish(int r) override {