gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 15:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #11181: attempting to read string as int triggers assertion

Browse Source
This commit is contained in:
Rubidium 2023-08-20 22:58:49 +02:00 committed by rubidium42
parent 8df4aa7979
commit 6635f809dd
3 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/strings.cpp
View File

@ -196,8 +196,11 @@ bool HaveDParamChanged(const std::vector<StringParameterBackup> &backup)
{
bool changed = false;
for (size_t i = 0; !changed && i < backup.size(); i++) {
if (backup[i].string.has_value()) {
changed = backup[i].string.value() != (const char *)(size_t)_global_string_params.GetParam(i);
bool global_has_string = _global_string_params.GetParamStr(i) != nullptr;
if (global_has_string != backup[i].string.has_value()) return true;
if (global_has_string) {
changed = backup[i].string.value() != _global_string_params.GetParamStr(i);
} else {
changed = backup[i].data != _global_string_params.GetParam(i);
}

1
src/tests/CMakeLists.txt
View File

@ -2,5 +2,6 @@ add_test_files(
landscape_partial_pixel_z.cpp
math_func.cpp
string_func.cpp
strings_func.cpp
test_main.cpp
)

52
src/tests/strings_func.cpp Normal file
View File

@ -0,0 +1,52 @@
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file strings_func.cpp Test functionality from strings_func. */
#include "../stdafx.h"
#include "../3rdparty/catch2/catch.hpp"
#include "../strings_func.h"
TEST_CASE("HaveDParamChanged")
{
SetDParam(0, 0);
SetDParamStr(1, "some string");
std::vector<StringParameterBackup> backup;
CopyOutDParam(backup, 2);
CHECK(HaveDParamChanged(backup) == false);
/* A different parameter 0 (both string and numeric). */
SetDParam(0, 1);
CHECK(HaveDParamChanged(backup) == true);
SetDParamStr(0, "some other string");
CHECK(HaveDParamChanged(backup) == true);
/* Back to the original state, nothing should have changed. */
SetDParam(0, 0);
CHECK(HaveDParamChanged(backup) == false);
/* A different parameter 1 (both string and numeric). */
SetDParamStr(1, "some other string");
CHECK(HaveDParamChanged(backup) == true);
SetDParam(1, 0);
CHECK(HaveDParamChanged(backup) == true);
/* Back to the original state, nothing should have changed. */
SetDParamStr(1, "some string");
CHECK(HaveDParamChanged(backup) == false);
/* Changing paramter 2 should not have any effect, as the backup is only 2 long. */
SetDParam(2, 3);
CHECK(HaveDParamChanged(backup) == false);
}