diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-01-09 16:43:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 16:43:06 -0800 |
| commit | 18adea343ebd77dce1180942fc773ec891153ff8 (patch) | |
| tree | b3a224c730c7201f2bcc8b8c309cbc0be2cfd2f9 | |
| parent | acbfb0083a611a974b887f6a5d63b55e444b1e89 (diff) | |
| parent | ea089c012eb88eb2e43526e8d5899e751c2eed94 (diff) | |
Merge pull request #7687 from german77/tas_handle
input_common: Handle errors on TAS scripts
| -rw-r--r-- | src/input_common/drivers/tas_input.cpp | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/src/input_common/drivers/tas_input.cpp b/src/input_common/drivers/tas_input.cpp index 5bdd5dac3d..d78228b50b 100644 --- a/src/input_common/drivers/tas_input.cpp +++ b/src/input_common/drivers/tas_input.cpp @@ -105,10 +105,16 @@ void Tas::LoadTasFile(size_t player_index, size_t file_index) { continue; } - const auto num_frames = std::stoi(seg_list[0]); - while (frame_no < num_frames) { - commands[player_index].emplace_back(); - frame_no++; + try { + const auto num_frames = std::stoi(seg_list[0]); + while (frame_no < num_frames) { + commands[player_index].emplace_back(); + frame_no++; + } + } catch (const std::invalid_argument&) { + LOG_ERROR(Input, "Invalid argument: '{}' at command {}", seg_list[0], frame_no); + } catch (const std::out_of_range&) { + LOG_ERROR(Input, "Out of range: '{}' at command {}", seg_list[0], frame_no); } TASCommand command = { @@ -233,10 +239,21 @@ TasAnalog Tas::ReadCommandAxis(const std::string& line) const { } } - const float x = std::stof(seg_list.at(0)) / 32767.0f; - const float y = std::stof(seg_list.at(1)) / 32767.0f; + if (seg_list.size() < 2) { + LOG_ERROR(Input, "Invalid axis data: '{}'", line); + return {}; + } - return {x, y}; + try { + const float x = std::stof(seg_list.at(0)) / 32767.0f; + const float y = std::stof(seg_list.at(1)) / 32767.0f; + return {x, y}; + } catch (const std::invalid_argument&) { + LOG_ERROR(Input, "Invalid argument: '{}'", line); + } catch (const std::out_of_range&) { + LOG_ERROR(Input, "Out of range: '{}'", line); + } + return {}; } u64 Tas::ReadCommandButtons(const std::string& line) const { |