Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 18:04:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Guard all cases obj.getteleporter() is used unchecked

Browse Source 
obj.getteleporter() is able to return -1. If there's no check on it, it
will end up indexing out-of-bounds, which is Undefined Behavior.
This commit is contained in:
Misa
2020-06-12 19:31:08 -07:00
committed by Ethan Lee
parent 3b76713441
commit 08e47e839f
3 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
desktop_version/src/Script.cpp
View File

@@ -1097,8 +1097,11 @@ void scriptclass::run()
else if (words[0] == "activateteleporter")
{
i = obj.getteleporter();
obj.entities[i].tile = 6;
obj.entities[i].colour = 102;
if (i > -1)
{
obj.entities[i].tile = 6;
obj.entities[i].colour = 102;
}
}
else if (words[0] == "changecolour")
{
@@ -1835,7 +1838,10 @@ void scriptclass::run()
else if (words[0] == "activeteleporter")
{
i = obj.getteleporter();
obj.entities[i].colour = 101;
if (i > -1)
{
obj.entities[i].colour = 101;
}
}
else if (words[0] == "foundtrinket")
{
@@ -3290,12 +3296,18 @@ void scriptclass::teleport()
game.gravitycontrol = 0;
map.gotoroom(100+game.teleport_to_x, 100+game.teleport_to_y);
j = obj.getteleporter();
obj.entities[j].state = 2;
if (j > -1)
{
obj.entities[j].state = 2;
}
game.teleport_to_new_area = false;
game.savepoint = obj.entities[j].para;
game.savex = obj.entities[j].xp + 44;
game.savey = obj.entities[j].yp + 44;
if (j > -1)
{
game.savepoint = obj.entities[j].para;
game.savex = obj.entities[j].xp + 44;
game.savey = obj.entities[j].yp + 44;
}
game.savegc = 0;
game.saverx = game.roomx;