zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed bad conversion from FString to const char * in state label type cast.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-19 12:25:53 +01:00
parent 9fab8380ff
commit 25e285b65d
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/scripting/codegeneration/codegen.cpp
View file

@ -1440,8 +1440,8 @@ FxExpression *FxTypeCast::Resolve(FCompileContext &ctx)
// Right now this only supports string constants. There should be an option to pass a string variable, too. // Right now this only supports string constants. There should be an option to pass a string variable, too.
if (basex->isConstant() && (basex->ValueType == TypeString || basex->ValueType == TypeName)) if (basex->isConstant() && (basex->ValueType == TypeString || basex->ValueType == TypeName))
{ {
const char *s = static_cast<FxConstant *>(basex)->GetValue().GetString(); FString s= static_cast<FxConstant *>(basex)->GetValue().GetString();
if (*s == 0 && !ctx.FromDecorate) // DECORATE should never get here at all, but let's better be safe. if (s.Len() == 0 && !ctx.FromDecorate) // DECORATE should never get here at all, but let's better be safe.
{ {
ScriptPosition.Message(MSG_ERROR, "State jump to empty label."); ScriptPosition.Message(MSG_ERROR, "State jump to empty label.");
delete this; delete this;