From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 5 Jun 2017 17:17:19 +0000 (-0400)
Subject: rbd: properly decode features when using image name optional
X-Git-Tag: v10.2.10~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9e87fef6a4771545cc23fe94c9cb9656ca5b773;p=ceph.git

rbd: properly decode features when using image name optional

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

diff --git a/src/tools/rbd/action/Feature.cc b/src/tools/rbd/action/Feature.cc
index d1b6d1fd50d4..de48917ff59d 100644
--- a/src/tools/rbd/action/Feature.cc
+++ b/src/tools/rbd/action/Feature.cc
@@ -56,9 +56,14 @@ int execute(const po::variables_map &vm, bool enabled) {
     return r;
   }
 
-  const std::vector<std::string> &args = vm[at::POSITIONAL_ARGUMENTS]
-    .as<std::vector<std::string> >();
-  std::vector<std::string> feature_names(args.begin() + 1, args.end());
+  std::vector<std::string> feature_names;
+  if (vm.count(at::POSITIONAL_ARGUMENTS)) {
+    const std::vector<std::string> &args =
+      vm[at::POSITIONAL_ARGUMENTS].as<std::vector<std::string> >();
+    feature_names.insert(feature_names.end(), args.begin() + arg_index,
+                         args.end());
+  }
+
   if (feature_names.empty()) {
     std::cerr << "rbd: at least one feature name must be specified"
               << std::endl;