Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +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

31
desktop_version/src/Game.cpp
View File

@@ -2157,6 +2157,7 @@ void Game::updatestate()
music.playef(10);
break;
case 2502:
{
//Activating a teleporter 2
state++;
statedelay = 5;
@@ -2165,17 +2166,25 @@ void Game::updatestate()
obj.entities[i].colour = 0;
obj.entities[i].invis = false;
obj.entities[i].xp = obj.entities[obj.getteleporter()].xp+44;
obj.entities[i].yp = obj.entities[obj.getteleporter()].yp+44;
int j = obj.getteleporter();
if (j > -1)
{
obj.entities[i].xp = obj.entities[j].xp+44;
obj.entities[i].yp = obj.entities[j].yp+44;
}
obj.entities[i].ay = -6;
obj.entities[i].ax = 6;
obj.entities[i].vy = -6;
obj.entities[i].vx = 6;
i = obj.getteleporter();
obj.entities[i].tile = 1;
obj.entities[i].colour = 101;
if (i > -1)
{
obj.entities[i].tile = 1;
obj.entities[i].colour = 101;
}
break;
}
case 2503:
state++;
i = obj.getplayer();
@@ -2316,8 +2325,11 @@ void Game::updatestate()
}
i = obj.getteleporter();
obj.entities[i].tile = 1;
obj.entities[i].colour = 100;
if (i > -1)
{
obj.entities[i].tile = 1;
obj.entities[i].colour = 100;
}
break;
case 3006:
@@ -3517,8 +3529,11 @@ void Game::updatestate()
}
i = obj.getteleporter();
activetele = true;
teleblock.x = obj.entities[i].xp - 32;
teleblock.y = obj.entities[i].yp - 32;
if (i > -1)
{
teleblock.x = obj.entities[i].xp - 32;
teleblock.y = obj.entities[i].yp - 32;
}
teleblock.w = 160;
teleblock.h = 160;
hascontrol = true;