Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed script crashes

Browse source
This commit is contained in:
smallmodel 2023-08-13 17:59:49 +02:00
parent ea78d96bc3
commit f857116f75
No known key found for this signature in database
GPG key ID: A96F163ED4891440
4 changed files with 178 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

133
code/script/scriptvm.cpp
View file

@ -361,28 +361,48 @@ void ScriptVM::error(const char *format, ...)
m_ReturnValue.setStringValue("$.INTERRUPTED");
}
/*
====================
jump
====================
*/
void ScriptVM::jump(int offset)
void ScriptVM::jump(unsigned int offset)
{
m_CodePos += offset;
m_CodePos += offset;
}
/*
====================
jumpBool
====================
*/
void ScriptVM::jumpBool(int offset, bool booleanValue)
void ScriptVM::jumpBack(unsigned int offset)
{
if (booleanValue) {
jump(offset);
} else {
m_CodePos += sizeof(unsigned int);
}
m_CodePos -= offset;
}
void ScriptVM::jumpBool(unsigned int offset, bool booleanValue)
{
if (booleanValue)
{
jump(offset);
}
}
bool ScriptVM::jumpVar(unsigned int offset, bool booleanValue)
{
if (booleanValue)
{
jump(offset);
return true;
}
else
{
m_VMStack.Pop();
return false;
}
}
void ScriptVM::doJumpIf(bool booleanValue)
{
const unsigned int offset = fetchOpcodeValue<unsigned int>();
jumpBool(offset, booleanValue);
}
bool ScriptVM::doJumpVarIf(bool booleanValue)
{
const unsigned int offset = fetchOpcodeValue<unsigned int>();
return jumpVar(offset, booleanValue);
}
void ScriptVM::loadTopInternal(Listener *listener)
@ -956,7 +976,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
}
*/
}
index = 0;
eventCalled = false;
@ -1075,63 +1095,42 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
break;
case OP_BOOL_JUMP_FALSE4:
jumpBool(fetchOpcodeValue<unsigned int>() + sizeof(unsigned int), !m_VMStack.Pop().m_data.intValue);
doJumpIf(!m_VMStack.Pop().m_data.intValue);
break;
case OP_BOOL_JUMP_TRUE4:
doJumpIf(m_VMStack.Pop().m_data.intValue);
break;
case OP_VAR_JUMP_FALSE4:
doJumpIf(!m_VMStack.Pop().booleanValue());
break;
case OP_BOOL_JUMP_TRUE4:
jumpBool(
fetchOpcodeValue<unsigned int>() + sizeof(unsigned int),
m_VMStack.Pop().m_data.intValue ? true : false
);
break;
case OP_VAR_JUMP_FALSE4:
jumpBool(fetchOpcodeValue<unsigned int>() + sizeof(unsigned int), !m_VMStack.Pop().booleanValue());
break;
case OP_VAR_JUMP_TRUE4:
jumpBool(fetchOpcodeValue<unsigned int>() + sizeof(unsigned int), m_VMStack.Pop().booleanValue());
case OP_VAR_JUMP_TRUE4:
doJumpIf(m_VMStack.Pop().booleanValue());
break;
case OP_BOOL_LOGICAL_AND:
if (m_VMStack.GetTop().m_data.intValue) {
m_VMStack.Pop();
m_CodePos += sizeof(unsigned int);
} else {
m_CodePos += fetchOpcodeValue<unsigned int>() + sizeof(unsigned int);
}
break;
doJumpVarIf(!m_VMStack.GetTop().m_data.intValue);
break;
case OP_BOOL_LOGICAL_OR:
if (!m_VMStack.GetTop().m_data.intValue) {
m_VMStack.Pop();
m_CodePos += sizeof(unsigned int);
} else {
m_CodePos += fetchOpcodeValue<unsigned int>() + sizeof(unsigned int);
}
break;
doJumpVarIf(m_VMStack.GetTop().m_data.intValue);
break;
case OP_VAR_LOGICAL_AND:
if (m_VMStack.GetTop().booleanValue()) {
m_VMStack.Pop();
m_CodePos += sizeof(unsigned int);
} else {
if (!doJumpVarIf(m_VMStack.GetTop().booleanValue()))
{
m_VMStack.GetTop().SetFalse();
m_CodePos += fetchOpcodeValue<unsigned int>() + sizeof(unsigned int);
}
break;
}
break;
case OP_VAR_LOGICAL_OR:
if (!m_VMStack.GetTop().booleanValue()) {
m_VMStack.Pop();
m_CodePos += sizeof(unsigned int);
} else {
if (!doJumpVarIf(!m_VMStack.GetTop().booleanValue()))
{
m_VMStack.GetTop().SetTrue();
m_CodePos += fetchOpcodeValue<unsigned int>() + sizeof(unsigned int);
}
break;
}
break;
case OP_BOOL_STORE_FALSE:
m_VMStack.PushAndGet().SetFalse();
@ -1288,12 +1287,12 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
break;
}
case OP_JUMP4:
m_CodePos += *reinterpret_cast<int *>(m_CodePos) + sizeof(unsigned int);
case OP_JUMP4:
jump(fetchOpcodeValue<unsigned int>());
break;
case OP_JUMP_BACK4:
m_CodePos -= *reinterpret_cast<int *>(m_CodePos);
case OP_JUMP_BACK4:
jumpBack(fetchActualOpcodeValue<unsigned int>());
break;
case OP_LOAD_ARRAY_VAR: