This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 15cdb35dd1 Coverity Fixes (#12821)
15cdb35dd1 is described below
commit 15cdb35dd14aa090eeb3bd28e0dcff922a981dc4
Author: Phil Sorber <[email protected]>
AuthorDate: Thu Jan 29 09:35:07 2026 -0800
Coverity Fixes (#12821)
* Fix Coverity CID 1644341: Suppress false positive for bravo lock
The ts::bravo::shared_lock properly holds the mutex but Coverity doesn't
recognize this custom lock class. Add suppression comment.
* Fix Coverity CID 1644338: Handle exceptions in Stripe destructor
Wrap potentially throwing diagnostic code (Dbg, ink_assert) in try-catch
to ensure destructor never throws. Memory cleanup continues regardless.
* Fix Coverity CID 1644337: Suppress false positive for copy assignment test
The test intentionally uses copy assignment (not move) to verify
copy assignment operator behavior. Add suppression comment.
* Fix Coverity CID 1644336: Initialize entrylist before scandir
Initialize entrylist to nullptr before passing to scandir to satisfy
static analysis, even though scandir allocates the memory.
* Fix Coverity CID 1644335: Make StaticString thread-safe
Add proper mutex protection to StaticString:
- Add mutex locks to _createString() and lookup()
- Add for_each() method for thread-safe iteration
- Remove begin()/end() which exposed non-thread-safe iterators
- Update RecCore.cc to use for_each()
* Fix Coverity CID 1644332/1644314: Suppress false positive in State
destructor
Add suppression comment. The destroy() method only frees memory and
does ref counting - it cannot throw.
* Fix Coverity CID 1644330: Suppress false positive for visitor pattern
The visitor intentionally moves from the variant alternative to consume it.
The caller should not use the moved-from value after the visitor returns.
* Fix Coverity CID 1644329: Remove noexcept from UnitParser::operator()
The function calls Lexicon::operator[] which uses std::visit internally
and can throw std::domain_error for unknown unit names. Remove noexcept
to allow the exception to propagate.
* Fix Coverity CID 1644324: Handle exceptions in HttpSM destructor
Wrap m_remap->release() in try-catch since it can allocate (new_Deleter).
Add suppression comments for other calls that cannot throw.
* Fix Coverity CID 1644319: Use memcpy instead of strcpy
Replace strcpy with memcpy using explicit length from string_view.
This satisfies static analysis even though the assert validates
the size. Also explicitly null-terminate the destination.
* Fix Coverity CID 1644318: Add null check before strcmp
Add REQUIRE(result->hostname \!= nullptr) before strcmp calls to ensure
the pointer is valid, preventing potential null dereference.
* Fix Coverity CID 1644316: PASS_BY_VALUE in IOBuffer.cc
Make the Lexicon static to avoid capturing 360 bytes by value in the
lambda. The lambda now captures nothing and references the static
lexicon directly.
* Fix Coverity CID 1644312: Suppress false positive RESOURCE_LEAK
Add suppression comment for false positive. The heap is freed via
hdr.destroy() -> HdrHeapSDKHandle::destroy() -> m_heap->destroy().
* Fix Coverity CID 1644310: COPY_INSTEAD_OF_MOVE in regex_remap.cc
Use std::move when assigning opt_val to _strategy since opt_val is
not used again after this assignment in the strategy branch.
* Fix Coverity CID 1644323: CHECKED_RETURN in ts_util.cc
Check the return value of TSCacheUrlSet and return an error Errata
if the call fails.
* Fix Coverity CID 1644326: OVERRUN in test_HpackIndexingTable.cc
Add Coverity suppression comment for false positive. The len parameter
is validated positive by REQUIRE(len > 0) before the memcmp call, but
Coverity doesn't recognize that REQUIRE throws on failure.
* Fix Coverity CID 1644325: WRAPPER_ESCAPE in test_RemapPlugin.cc
Add Coverity suppression for false positive. The plugin pointer
temporarily escapes to pluginThreadContext in doneInstance() but
is properly reset via resetPluginContext() before the method returns.
* Fix Coverity CID 1644320: UNCAUGHT_EXCEPT in traffic_crashlog.cc
Add Coverity suppression for false positive. The std::optional access
via ats_as_c_str() is properly guarded by checking the optional has
a value before calling the function.
* Fix Coverity CID 1644327: UNCAUGHT_EXCEPT in test_AIO.cc
Add Coverity suppression. Functions called from main() may throw
exceptions, but this is a test program where uncaught exceptions
will terminate with a stack trace, which is acceptable behavior.
* Fix inverted condition that could throw std::bad_optional_access
The RECD_COUNTER case in plugin_expand() had an inverted condition:
'if (count_val)' instead of 'if (!count_val)'. This caused the code
to call .value() on an empty optional when the counter record was
not found, throwing std::bad_optional_access.
This matches the pattern used in the RECD_FLOAT and RECD_INT cases.
---
include/proxy/http/HttpTransact.h | 1 +
include/tsutil/Metrics.h | 27 +++++++++------
include/tsutil/ts_unit_parser.h | 2 +-
.../experimental/txn_box/plugin/src/Comparison.cc | 1 +
plugins/experimental/txn_box/plugin/src/ts_util.cc | 4 ++-
plugins/regex_remap/regex_remap.cc | 2 +-
src/iocore/aio/test_AIO.cc | 1 +
src/iocore/cache/Stripe.cc | 1 +
src/iocore/eventsystem/IOBuffer.cc | 39 +++++++++++-----------
src/iocore/net/SSLSessionCache.cc | 3 +-
src/iocore/net/unit_tests/test_ProxyProtocol.cc | 1 +
src/proxy/Plugin.cc | 2 +-
src/proxy/hdrs/unit_tests/test_HeaderValidator.cc | 2 ++
src/proxy/http/HttpConfig.cc | 3 +-
src/proxy/http/HttpSM.cc | 11 +++++-
src/proxy/http/remap/RemapConfig.cc | 2 +-
.../remap/unit-tests/test_NextHopRoundRobin.cc | 2 ++
.../http/remap/unit-tests/test_RemapPlugin.cc | 1 +
.../http2/unit_tests/test_HpackIndexingTable.cc | 1 +
src/records/RecCore.cc | 4 +--
src/traffic_crashlog/traffic_crashlog.cc | 1 +
src/tsutil/Metrics.cc | 7 ++--
src/tsutil/ts_unit_parser.cc | 2 +-
23 files changed, 76 insertions(+), 44 deletions(-)
diff --git a/include/proxy/http/HttpTransact.h
b/include/proxy/http/HttpTransact.h
index d01a7b10e1..856fbe991d 100644
--- a/include/proxy/http/HttpTransact.h
+++ b/include/proxy/http/HttpTransact.h
@@ -855,6 +855,7 @@ public:
// memset((void *)&host_db_info, 0, sizeof(host_db_info));
}
+ // coverity[exn_spec_violation] - destroy() only frees memory and does ref
counting
~State() { destroy(); }
void
diff --git a/include/tsutil/Metrics.h b/include/tsutil/Metrics.h
index 4a847f397a..630f079b4d 100644
--- a/include/tsutil/Metrics.h
+++ b/include/tsutil/Metrics.h
@@ -536,11 +536,15 @@ public:
}; // class Counter
+ /**
+ * Static string metrics storage.
+ *
+ * All methods are thread-safe.
+ */
class StaticString
{
public:
using StringStorage = std::unordered_map<std::string, std::string>;
- using iterator = StringStorage::iterator;
static void
createString(const std::string &name, const std::string_view value)
@@ -551,18 +555,21 @@ public:
static StaticString &instance();
- iterator
- begin()
+ /**
+ * Thread-safe iteration over all string metrics.
+ * The callback is invoked for each metric while holding the mutex.
+ */
+ template <typename Func>
+ void
+ for_each(Func &&func) const
{
- return _strings.begin();
+ std::lock_guard lock(_mutex);
+ for (const auto &[name, value] : _strings) {
+ func(name, value);
+ }
}
- iterator
- end()
- {
- return _strings.end();
- };
- std::optional<std::string_view> lookup(const std::string &name);
+ std::optional<std::string_view> lookup(const std::string &name) const;
private:
void _createString(const std::string &name, const std::string_view value);
diff --git a/include/tsutil/ts_unit_parser.h b/include/tsutil/ts_unit_parser.h
index 29c15610c4..16d6dfa90f 100644
--- a/include/tsutil/ts_unit_parser.h
+++ b/include/tsutil/ts_unit_parser.h
@@ -80,7 +80,7 @@ public:
* @param src Input string.
* @return The computed value if the input is valid, or an error report.
*/
- Rv<value_type> operator()(swoc::TextView const &src) const noexcept;
+ Rv<value_type> operator()(swoc::TextView const &src) const;
protected:
bool _unit_required_p = true; ///< Whether unitless values are allowed.
diff --git a/plugins/experimental/txn_box/plugin/src/Comparison.cc
b/plugins/experimental/txn_box/plugin/src/Comparison.cc
index aae89917b8..85013dd98a 100644
--- a/plugins/experimental/txn_box/plugin/src/Comparison.cc
+++ b/plugins/experimental/txn_box/plugin/src/Comparison.cc
@@ -833,6 +833,7 @@ Cmp_Rxp::expr_visitor::operator()(std::monostate)
Rv<Comparison::Handle>
Cmp_Rxp::expr_visitor::operator()(Expr::Direct &d)
{
+ // coverity[use_after_move] - intentional: visitor consumes the variant
alternative
return Handle(new Cmp_RxpSingle(Expr{std::move(d)}, _rxp_opt));
}
diff --git a/plugins/experimental/txn_box/plugin/src/ts_util.cc
b/plugins/experimental/txn_box/plugin/src/ts_util.cc
index 81da18c32f..3df9c750ed 100644
--- a/plugins/experimental/txn_box/plugin/src/ts_util.cc
+++ b/plugins/experimental/txn_box/plugin/src/ts_util.cc
@@ -805,7 +805,9 @@ ts::HttpTxn::outbound_remote_addr() const
Errata
ts::HttpTxn::cache_key_assign(TextView const &key)
{
- TSCacheUrlSet(_txn, key.data(), key.size());
+ if (TS_ERROR == TSCacheUrlSet(_txn, key.data(), key.size())) {
+ return Errata(S_ERROR, R"(Failed to set cache key to "{}".)", key);
+ }
return {};
}
diff --git a/plugins/regex_remap/regex_remap.cc
b/plugins/regex_remap/regex_remap.cc
index 18838291e2..6eca1e8c33 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -320,7 +320,7 @@ RemapRegex::initialize(const std::string ®, const
std::string &sub, const std
_lowercase_substitutions = true;
} else if (opt.compare(start, 8, "strategy") == 0) {
_has_strategy = true;
- _strategy = opt_val;
+ _strategy = std::move(opt_val);
} else if (opt_val.size() <= 0) {
// All other options have a required value
TSError("[%s] Malformed options: %s", PLUGIN_NAME, opt.c_str());
diff --git a/src/iocore/aio/test_AIO.cc b/src/iocore/aio/test_AIO.cc
index 8a08c8445d..2900c87f03 100644
--- a/src/iocore/aio/test_AIO.cc
+++ b/src/iocore/aio/test_AIO.cc
@@ -459,6 +459,7 @@ public:
int
main(int argc, char *argv[])
{
+ // coverity[fun_call_w_exception] - called functions may throw but this is a
test program
int i;
// Read the configuration file
diff --git a/src/iocore/cache/Stripe.cc b/src/iocore/cache/Stripe.cc
index ebd98d0642..0fed76adfb 100644
--- a/src/iocore/cache/Stripe.cc
+++ b/src/iocore/cache/Stripe.cc
@@ -173,6 +173,7 @@ Stripe::_init_directory(std::size_t directory_size, int
header_size, int footer_
Stripe::~Stripe()
{
if (this->directory.raw_dir != nullptr) {
+ // coverity[fun_call_w_exception] - ink_assert aborts (doesn't throw), Dbg
is exception-safe
// Debug logging to track cleanup - helps correlate with crash location
Dbg(dbg_ctl_cache_free, "Stripe %s: freeing raw_dir=%p size=%zu huge=%s",
hash_text.get() ? hash_text.get() : "(null)",
this->directory.raw_dir, this->directory.raw_dir_size,
this->directory.raw_dir_huge ? "true" : "false");
diff --git a/src/iocore/eventsystem/IOBuffer.cc
b/src/iocore/eventsystem/IOBuffer.cc
index 228353502e..246d98b5d4 100644
--- a/src/iocore/eventsystem/IOBuffer.cc
+++ b/src/iocore/eventsystem/IOBuffer.cc
@@ -1046,25 +1046,26 @@ auto
make_buffer_size_parser()
{
using L = swoc::Lexicon<int>;
- return [l = L{
- L::with_multi{{0, {"128"}},
- {1, {"256"}},
- {2, {"512"}},
- {3, {"1k", "1024"}},
- {4, {"2k", "2048"}},
- {5, {"4k", "4096"}},
- {6, {"8k", "8192"}},
- {7, {"16k"}},
- {8, {"32k"}},
- {9, {"64k"}},
- {10, {"128k"}},
- {11, {"256k"}},
- {12, {"512k"}},
- {13, {"1M", "1024k"}},
- {14, {"2M", "2048k"}}},
- -1
- }](swoc::TextView esize) -> std::optional<int> {
- int result = l[esize];
+ static const L lexicon{
+ L::with_multi{{0, {"128"}},
+ {1, {"256"}},
+ {2, {"512"}},
+ {3, {"1k", "1024"}},
+ {4, {"2k", "2048"}},
+ {5, {"4k", "4096"}},
+ {6, {"8k", "8192"}},
+ {7, {"16k"}},
+ {8, {"32k"}},
+ {9, {"64k"}},
+ {10, {"128k"}},
+ {11, {"256k"}},
+ {12, {"512k"}},
+ {13, {"1M", "1024k"}},
+ {14, {"2M", "2048k"}}},
+ -1
+ };
+ return [](swoc::TextView esize) -> std::optional<int> {
+ int result = lexicon[esize];
if (result == -1) {
return std::nullopt;
}
diff --git a/src/iocore/net/SSLSessionCache.cc
b/src/iocore/net/SSLSessionCache.cc
index 7e848b41b4..9dcccd535e 100644
--- a/src/iocore/net/SSLSessionCache.cc
+++ b/src/iocore/net/SSLSessionCache.cc
@@ -179,7 +179,8 @@ SSLSessionBucket::insertSession(const SSLSessionID &id,
SSL_SESSION *sess, SSL *
} else {
std::string_view group_name = SSLGetGroupName(ssl);
ink_release_assert(group_name.size() < sizeof(exdata->group_name));
- strcpy(exdata->group_name, group_name.data());
+ memcpy(exdata->group_name, group_name.data(), group_name.size());
+ exdata->group_name[group_name.size()] = '\0';
}
std::unique_ptr<SSLSession> ssl_session(new SSLSession(id, buf, len,
buf_exdata));
diff --git a/src/iocore/net/unit_tests/test_ProxyProtocol.cc
b/src/iocore/net/unit_tests/test_ProxyProtocol.cc
index 56e3aed064..70ead688be 100644
--- a/src/iocore/net/unit_tests/test_ProxyProtocol.cc
+++ b/src/iocore/net/unit_tests/test_ProxyProtocol.cc
@@ -773,6 +773,7 @@ TEST_CASE("ProxyProtocol Rule of 5", "[ProxyProtocol]")
std::string_view copy_tlv_data("\x02\x00\x04copy", 7);
copy.set_additional_data(copy_tlv_data);
+ // coverity[copy_instead_of_move] - intentionally testing copy assignment
copy = original;
// After assignment, copy should have original's data
diff --git a/src/proxy/Plugin.cc b/src/proxy/Plugin.cc
index dfcaa1450e..5e2d1e6bb7 100644
--- a/src/proxy/Plugin.cc
+++ b/src/proxy/Plugin.cc
@@ -254,7 +254,7 @@ plugin_expand(char *arg)
}
case RECD_COUNTER: {
auto count_val{RecGetRecordCounter(arg)};
- if (count_val) {
+ if (!count_val) {
goto not_found;
}
str = static_cast<char *>(ats_malloc(128));
diff --git a/src/proxy/hdrs/unit_tests/test_HeaderValidator.cc
b/src/proxy/hdrs/unit_tests/test_HeaderValidator.cc
index 71db0c0a57..c11bc9d8d7 100644
--- a/src/proxy/hdrs/unit_tests/test_HeaderValidator.cc
+++ b/src/proxy/hdrs/unit_tests/test_HeaderValidator.cc
@@ -56,6 +56,8 @@ TEST_CASE("testIsHeaderValid", "[proxy][hdrtest]")
{
HTTPHdr hdr;
// extra to prevent proxy allocation.
+ // coverity[resource_leak] - heap is freed via hdr.destroy() which calls
+ // HdrHeapSDKHandle::destroy() -> m_heap->destroy()
HdrHeap *heap = new_HdrHeap(HdrHeap::DEFAULT_SIZE + 64);
SECTION("Test (valid) request with 4 required pseudo headers")
diff --git a/src/proxy/http/HttpConfig.cc b/src/proxy/http/HttpConfig.cc
index 9276abdaef..3b7352b1fc 100644
--- a/src/proxy/http/HttpConfig.cc
+++ b/src/proxy/http/HttpConfig.cc
@@ -721,7 +721,8 @@ ParsedConfigCache::lookup_impl(TSOverridableConfigKey key,
std::string_view valu
// Fast path: check cache under read lock.
{
ts::bravo::shared_lock lock(_mutex);
- auto it = _cache.find(cache_key);
+ // coverity[missing_lock] - ts::bravo::shared_lock properly holds the mutex
+ auto it = _cache.find(cache_key);
if (it != _cache.end()) {
return it->second;
}
diff --git a/src/proxy/http/HttpSM.cc b/src/proxy/http/HttpSM.cc
index a12d3183b6..d9cfb66292 100644
--- a/src/proxy/http/HttpSM.cc
+++ b/src/proxy/http/HttpSM.cc
@@ -280,9 +280,17 @@ HttpSM::~HttpSM()
{
http_parser_clear(&http_parser);
+ // coverity[exn_spec_violation] - release() only does ref counting and
delete on POD types
HttpConfig::release(t_state.http_config_param);
- m_remap->release();
+ // m_remap->release() can allocate (new_Deleter), so catch potential
bad_alloc
+ try {
+ m_remap->release();
+ } catch (...) {
+ Error("Exception in ~HttpSM during m_remap->release");
+ }
+
+ // coverity[exn_spec_violation] - cancel_pending_action() only sets boolean
flags
cache_sm.cancel_pending_action();
mutex.clear();
@@ -293,6 +301,7 @@ HttpSM::~HttpSM()
debug_on = false;
if (_prewarm_sm) {
+ // coverity[exn_spec_violation] - destroy() only frees memory and resets
shared_ptrs
_prewarm_sm->destroy();
THREAD_FREE(_prewarm_sm, preWarmSMAllocator, this_ethread());
_prewarm_sm = nullptr;
diff --git a/src/proxy/http/remap/RemapConfig.cc
b/src/proxy/http/remap/RemapConfig.cc
index a1ceac4e0e..64d29d37c6 100644
--- a/src/proxy/http/remap/RemapConfig.cc
+++ b/src/proxy/http/remap/RemapConfig.cc
@@ -365,7 +365,7 @@ parse_include_directive(const char *directive,
BUILD_TABLE_INFO *bti, char *errb
path = RecConfigReadConfigPath(nullptr, bti->paramv[i]);
if (ink_file_is_directory(path)) {
- struct dirent **entrylist;
+ struct dirent **entrylist = nullptr;
int n_entries;
n_entries = scandir(path, &entrylist, nullptr, alphasort);
diff --git a/src/proxy/http/remap/unit-tests/test_NextHopRoundRobin.cc
b/src/proxy/http/remap/unit-tests/test_NextHopRoundRobin.cc
index 2fc1875501..908dbc35e5 100644
--- a/src/proxy/http/remap/unit-tests/test_NextHopRoundRobin.cc
+++ b/src/proxy/http/remap/unit-tests/test_NextHopRoundRobin.cc
@@ -287,6 +287,7 @@ SCENARIO("Testing NextHopRoundRobin class, using policy
'rr-ip'", "[NextHopRound
build_request(10017, &sm, &sa2, "rabbit.net", nullptr);
result->reset();
strategy->findNextHop(txnp);
+ REQUIRE(result->hostname != nullptr);
CHECK(strcmp(result->hostname, "p3.foo.com") == 0);
// call and test parentExists(), this call should not affect
@@ -297,6 +298,7 @@ SCENARIO("Testing NextHopRoundRobin class, using policy
'rr-ip'", "[NextHopRound
build_request(10018, &sm, &sa2, "rabbit.net", nullptr);
result->reset();
strategy->findNextHop(txnp);
+ REQUIRE(result->hostname != nullptr);
CHECK(strcmp(result->hostname, "p3.foo.com") == 0);
// call and test parentExists(), this call should not affect
diff --git a/src/proxy/http/remap/unit-tests/test_RemapPlugin.cc
b/src/proxy/http/remap/unit-tests/test_RemapPlugin.cc
index c81790bdfc..d2aaf3d3bc 100644
--- a/src/proxy/http/remap/unit-tests/test_RemapPlugin.cc
+++ b/src/proxy/http/remap/unit-tests/test_RemapPlugin.cc
@@ -395,6 +395,7 @@ SCENARIO("unloading the plugin", "[plugin][core]")
{
debugObject->clear();
+ // coverity[wrapper_escape] - plugin pointer temporarily escapes to
thread context but is reset before return
plugin->doneInstance(INSTANCE_HANDLER);
THEN("expect it to run and receive the right instance handler")
diff --git a/src/proxy/http2/unit_tests/test_HpackIndexingTable.cc
b/src/proxy/http2/unit_tests/test_HpackIndexingTable.cc
index cba2ff5587..ad373211fb 100644
--- a/src/proxy/http2/unit_tests/test_HpackIndexingTable.cc
+++ b/src/proxy/http2/unit_tests/test_HpackIndexingTable.cc
@@ -208,6 +208,7 @@ TEST_CASE("HPACK low level APIs", "[hpack]")
REQUIRE(len > 0);
REQUIRE(len == literal_test_case[i].encoded_field_len);
+ // coverity[overrun-buffer-arg] - len is validated positive above
REQUIRE(memcmp(buf, literal_test_case[i].encoded_field, len) == 0);
}
}
diff --git a/src/records/RecCore.cc b/src/records/RecCore.cc
index 6008ee4fec..cf816550c4 100644
--- a/src/records/RecCore.cc
+++ b/src/records/RecCore.cc
@@ -595,7 +595,7 @@ RecLookupMatchingRecords(unsigned rec_type, const char
*match, void (*callback)(
}
}
// Finally check string metrics
- for (auto &&[name, value] : ts::Metrics::StaticString::instance()) {
+ ts::Metrics::StaticString::instance().for_each([&](const std::string
&name, const std::string &value) {
if (regex.exec(name)) {
RecRecord tmp;
@@ -608,7 +608,7 @@ RecLookupMatchingRecords(unsigned rec_type, const char
*match, void (*callback)(
tmp.data.rec_string = const_cast<char *>(value.c_str());
callback(&tmp, data);
}
- }
+ });
}
int num_records = g_num_records;
diff --git a/src/traffic_crashlog/traffic_crashlog.cc
b/src/traffic_crashlog/traffic_crashlog.cc
index 404b720255..e31c0d40bf 100644
--- a/src/traffic_crashlog/traffic_crashlog.cc
+++ b/src/traffic_crashlog/traffic_crashlog.cc
@@ -229,6 +229,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
if (syslog_mode) {
int facility = -1;
if (auto name{RecGetRecordStringAlloc("proxy.config.syslog_facility")};
name) {
+ // coverity[fun_call_w_exception] - guarded by if(name) check above
facility = facility_string_to_int(ats_as_c_str(name));
}
diff --git a/src/tsutil/Metrics.cc b/src/tsutil/Metrics.cc
index b19c61cf1b..ae96c1dbba 100644
--- a/src/tsutil/Metrics.cc
+++ b/src/tsutil/Metrics.cc
@@ -303,15 +303,14 @@ Metrics::StaticString::instance()
void
Metrics::StaticString::_createString(const std::string &name, const
std::string_view value)
{
- std::lock_guard l(_mutex);
-
+ std::lock_guard lock(_mutex);
_strings[name] = value;
}
std::optional<std::string_view>
-Metrics::StaticString::lookup(const std::string &name)
+Metrics::StaticString::lookup(const std::string &name) const
{
- std::lock_guard l(_mutex);
+ std::lock_guard lock(_mutex);
auto it = _strings.find(name);
std::optional<std::string_view> result{};
diff --git a/src/tsutil/ts_unit_parser.cc b/src/tsutil/ts_unit_parser.cc
index a506534583..b4a620cab5 100644
--- a/src/tsutil/ts_unit_parser.cc
+++ b/src/tsutil/ts_unit_parser.cc
@@ -31,7 +31,7 @@ namespace ts
{
auto
-UnitParser::operator()(swoc::TextView const &src) const noexcept ->
Rv<value_type>
+UnitParser::operator()(swoc::TextView const &src) const -> Rv<value_type>
{
value_type zret = 0;
TextView text = src; // Keep @a src around to report error offsets.
