mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix d1463f415f: Wrong type of exception thrown by invalid string parameters. 

`FormatString()` only catches `std::out_of_range`, but `GetNextParameter()` threw `std::runtime_error`.
pull/12954/head
Peter Nelson 2024-09-19 18:07:16 +01:00 committed by Peter Nelson
parent 3bfd9de68d
commit 719d063bd4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/strings_internal.h
View File

@ -94,7 +94,7 @@ public:
const auto &param = GetNextParameterReference(); const auto &param = GetNextParameterReference();
const uint64_t *data = std::get_if<uint64_t>(&param.data); const uint64_t *data = std::get_if<uint64_t>(&param.data);
if (data != nullptr) return static_cast<T>(*data); if (data != nullptr) return static_cast<T>(*data);
throw std::runtime_error("Attempt to read string parameter as integer"); throw std::out_of_range("Attempt to read string parameter as integer");
} }
/** /**
@ -108,7 +108,7 @@ public:
const auto &param = GetNextParameterReference(); const auto &param = GetNextParameterReference();
const std::string *data = std::get_if<std::string>(&param.data); const std::string *data = std::get_if<std::string>(&param.data);
if (data != nullptr) return data->c_str(); if (data != nullptr) return data->c_str();
throw std::runtime_error("Attempt to read integer parameter as string"); throw std::out_of_range("Attempt to read integer parameter as string");
} }
/** /**