dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change: [Script] A ScriptText with too many parameters is now a fatal error

Browse Source 
It should never happen as adding/setting parameters already checks that anyway.
This commit is contained in:
glx22
2023-02-16 01:17:53 +01:00
committed by Loïc Guilloux
parent 2fdfc38da8
commit e735370318
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/api/script_text.cpp
View File

@@ -11,6 +11,7 @@
#include "../../string_func.h"
#include "../../strings_func.h"
#include "script_text.hpp"
#include "../script_fatalerror.hpp"
#include "../../table/control_codes.h"
#include "table/strings.h"
@@ -181,7 +182,8 @@ const char *ScriptText::GetEncodedText()
static char buf[1024];
int param_count = 0;
this->_GetEncodedText(buf, lastof(buf), param_count);
return (param_count > SCRIPT_TEXT_MAX_PARAMETERS) ? nullptr : buf;
if (param_count > SCRIPT_TEXT_MAX_PARAMETERS) throw Script_FatalError("A string had too many parameters");
return buf;
}
char *ScriptText::_GetEncodedText(char *p, char *lastofp, int &param_count)
@@ -208,8 +210,7 @@ char *ScriptText::_GetEncodedText(char *p, char *lastofp, int &param_count)
const char *Text::GetDecodedText()
{
const char *encoded_text = this->GetEncodedText();
if (encoded_text == nullptr) return nullptr;
const std::string &encoded_text = this->GetEncodedText();
static char buf[1024];
::SetDParamStr(0, encoded_text);