From d5b154f42876cb1946ca5f87d215ec02bc72bc56 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 8 May 2018 19:53:19 -0400 Subject: [PATCH] rgw: Catch exceptions at const references /Never/ by value. Signed-off-by: Adam C. Emerson (cherry picked from commit 25f6b639495ef9047480a286945793af50621bf6) --- src/rgw/rgw_op.cc | 2 +- src/rgw/rgw_swift_auth.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index d472490a1c3f8..c95ccf861cf81 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -4310,7 +4310,7 @@ int RGWDeleteObj::handle_slo_manifest(bufferlist& bl) try { deleter = std::unique_ptr(\ new RGWBulkDelete::Deleter(store, s)); - } catch (std::bad_alloc) { + } catch (const std::bad_alloc&) { return -ENOMEM; } diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc index 4e9b082eaae27..d73b6d51d9635 100644 --- a/src/rgw/rgw_swift_auth.cc +++ b/src/rgw/rgw_swift_auth.cc @@ -399,7 +399,7 @@ ExternalTokenEngine::authenticate(const std::string& token, } else { swift_user = std::move(swift_groups[0]); } - } catch (std::out_of_range) { + } catch (const std::out_of_range&) { /* The X-Auth-Groups header isn't present in the response. */ return result_t::deny(-EPERM); } -- 2.39.5