From 655b3c9d1c3f2507f47b3398e08a1a5db7f3f117 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 17 Mar 2017 14:53:35 -0400
Subject: [PATCH] librbd: fix valid coverity warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/librbd/mirror/GetStatusRequest.cc | 1 +
 src/tools/rbd/Utils.cc                | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/librbd/mirror/GetStatusRequest.cc b/src/librbd/mirror/GetStatusRequest.cc
index 7899321577f70..b21a16a1f8d1b 100644
--- a/src/librbd/mirror/GetStatusRequest.cc
+++ b/src/librbd/mirror/GetStatusRequest.cc
@@ -91,6 +91,7 @@ void GetStatusRequest<I>::handle_get_status(int r) {
     lderr(cct) << "failed to retrieve mirror image status: " << cpp_strerror(r)
                << dendl;
     finish(r);
+    return;
   }
 
   finish(0);
diff --git a/src/tools/rbd/Utils.cc b/src/tools/rbd/Utils.cc
index 7a1c9d36ef387..99ffc8053c468 100644
--- a/src/tools/rbd/Utils.cc
+++ b/src/tools/rbd/Utils.cc
@@ -368,7 +368,7 @@ int get_pool_image_snapshot_names(const po::variables_map &vm,
     }
   }
 
-  if (pool_name->empty()) {
+  if (pool_name != nullptr && pool_name->empty()) {
     *pool_name = at::DEFAULT_POOL_NAME;
   }
 
-- 
2.39.5