Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC warning C4172 in ModifySafeMap::get (#14576)

Browse Source
This commit is contained in:
JosiahWI 2024-04-23 12:04:26 -05:00 committed by GitHub
parent 98fd5bd453
commit de8d80dee0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/container.h
View File

@ -369,7 +369,14 @@ public:
return it->second; return it->second;
} }
auto it = m_values.find(key); auto it = m_values.find(key);
return it == m_values.end() ? null_value : it->second; // This conditional block was converted from a ternary to ensure no
// temporary values are created in evaluating the return expression,
// which could cause a dangling reference.
if (it != m_values.end()) {
return it->second;
} else {
return null_value;
}
} }
void put(const K &key, const V &value) { void put(const K &key, const V &value) {