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

Guard all cases obj.getplayer() is used unchecked

Browse Source 
obj.getplayer() can return -1, which can cause out-of-bounds indexing of
obj.entities, which is really bad. This was by far the most changes, as
obj.getplayer() is the most used entity-getting function that returns
-1, as well as the most-used function whose sentinel value goes
unchecked.

To deal with the usage of obj.getplayer() in mapclass::warpto(), I just
added general bounds checks inside that function instead of changing all
the callers.
This commit is contained in:
Misa
2020-06-12 20:36:08 -07:00
committed by Ethan Lee
parent 08e47e839f
commit beab344267
7 changed files with 784 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
desktop_version/src/Script.cpp
View File

@@ -84,8 +84,11 @@ void scriptclass::run()
{
//USAGE: moveplayer(x offset, y offset)
int player = obj.getplayer();
obj.entities[player].xp += ss_toi(words[1]);
obj.entities[player].yp += ss_toi(words[2]);
if (player > -1)
{
obj.entities[player].xp += ss_toi(words[1]);
obj.entities[player].yp += ss_toi(words[2]);
}
scriptdelay = 1;
}
#if !defined(NO_CUSTOM_LEVELS)
@@ -230,7 +233,8 @@ void scriptclass::run()
}
if (words[0] == "tofloor")
{
if(obj.entities[obj.getplayer()].onroof>0)
int player = obj.getplayer();
if(player > -1 && obj.entities[player].onroof>0)
{
game.press_action = true;
scriptdelay = 1;
@@ -270,8 +274,11 @@ void scriptclass::run()
{
//USAGE: gotoposition(x position, y position, gravity position)
int player = obj.getplayer();
obj.entities[player].xp = ss_toi(words[1]);
obj.entities[player].yp = ss_toi(words[2]);
if (player > -1)
{
obj.entities[player].xp = ss_toi(words[1]);
obj.entities[player].yp = ss_toi(words[2]);
}
game.gravitycontrol = ss_toi(words[3]);
}
@@ -391,7 +398,10 @@ void scriptclass::run()
if (words[1] == "player")
{
i = obj.getplayer();
j = obj.entities[i].dir;
if (i > -1)
{
j = obj.entities[i].dir;
}
}
else if (words[1] == "cyan")
{
@@ -444,7 +454,7 @@ void scriptclass::run()
}
//next is whether to position above or below
if (words[2] == "above")
if (i > -1 && words[2] == "above")
{
if (j == 1) //left
{
@@ -457,7 +467,7 @@ void scriptclass::run()
texty = obj.entities[i].yp - 18 - (txt.size() * 8);
}
}
else
else if (i > -1)
{
if (j == 1) //left
{
@@ -660,24 +670,30 @@ void scriptclass::run()
{
//Create the super VVVVVV combo!
i = obj.getplayer();
obj.entities[i].xp = 30;
obj.entities[i].yp = 46;
obj.entities[i].size = 13;
obj.entities[i].colour = 23;
obj.entities[i].cx = 36;// 6;
obj.entities[i].cy = 12+80;// 2;
obj.entities[i].h = 126-80;// 21;
if (i > -1)
{
obj.entities[i].xp = 30;
obj.entities[i].yp = 46;
obj.entities[i].size = 13;
obj.entities[i].colour = 23;
obj.entities[i].cx = 36;// 6;
obj.entities[i].cy = 12+80;// 2;
obj.entities[i].h = 126-80;// 21;
}
}
else if (words[0] == "undovvvvvvman")
{
//Create the super VVVVVV combo!
i = obj.getplayer();
obj.entities[i].xp = 100;
obj.entities[i].size = 0;
obj.entities[i].colour = 0;
obj.entities[i].cx = 6;
obj.entities[i].cy = 2;
obj.entities[i].h = 21;
if (i > -1)
{
obj.entities[i].xp = 100;
obj.entities[i].size = 0;
obj.entities[i].colour = 0;
obj.entities[i].cx = 6;
obj.entities[i].cy = 2;
obj.entities[i].h = 21;
}
}
else if (words[0] == "createentity")
{
@@ -796,11 +812,11 @@ void scriptclass::run()
i=obj.getcrewman(1);
}
if (ss_toi(words[2]) == 0)
if (i > -1 && ss_toi(words[2]) == 0)
{
obj.entities[i].tile = 0;
}
else
else if (i > -1)
{
obj.entities[i].tile = 144;
}
@@ -893,7 +909,10 @@ void scriptclass::run()
i=obj.getcrewman(1);
}
obj.entities[i].tile = ss_toi(words[2]);
if (i > -1)
{
obj.entities[i].tile = ss_toi(words[2]);
}
}
else if (words[0] == "flipgravity")
{
@@ -973,7 +992,10 @@ void scriptclass::run()
i=obj.getcrewman(1);
}
obj.entities[i].tile +=12;
if (i > -1)
{
obj.entities[i].tile +=12;
}
}
else if (words[0] == "changedir")
{
@@ -1006,11 +1028,11 @@ void scriptclass::run()
i=obj.getcrewman(1);
}
if (ss_toi(words[2]) == 0)
if (i > -1 && ss_toi(words[2]) == 0)
{
obj.entities[i].dir = 0;
}
else
else if (i > -1)
{
obj.entities[i].dir = 1;
}
@@ -1075,14 +1097,17 @@ void scriptclass::run()
}
obj.entities[i].state = ss_toi(words[2]);
if (obj.entities[i].state == 16)
if (i > -1)
{
obj.entities[i].para=ss_toi(words[3]);
}
else if (obj.entities[i].state == 17)
{
obj.entities[i].dir=ss_toi(words[3]);
obj.entities[i].state = ss_toi(words[2]);
if (obj.entities[i].state == 16)
{
obj.entities[i].para=ss_toi(words[3]);
}
else if (obj.entities[i].state == 17)
{
obj.entities[i].dir=ss_toi(words[3]);
}
}
}
else if (words[0] == "alarmon")
@@ -1134,33 +1159,36 @@ void scriptclass::run()
i=obj.getcrewman(1);
}
if (words[2] == "cyan")
if (i > -1)
{
obj.entities[i].colour = 0;
}
else if (words[2] == "red")
{
obj.entities[i].colour = 15;
}
else if (words[2] == "green")
{
obj.entities[i].colour = 13;
}
else if (words[2] == "yellow")
{
obj.entities[i].colour = 14;
}
else if (words[2] == "blue")
{
obj.entities[i].colour = 16;
}
else if (words[2] == "purple")
{
obj.entities[i].colour = 20;
}
else if (words[2] == "teleporter")
{
obj.entities[i].colour = 102;
if (words[2] == "cyan")
{
obj.entities[i].colour = 0;
}
else if (words[2] == "red")
{
obj.entities[i].colour = 15;
}
else if (words[2] == "green")
{
obj.entities[i].colour = 13;
}
else if (words[2] == "yellow")
{
obj.entities[i].colour = 14;
}
else if (words[2] == "blue")
{
obj.entities[i].colour = 16;
}
else if (words[2] == "purple")
{
obj.entities[i].colour = 20;
}
else if (words[2] == "teleporter")
{
obj.entities[i].colour = 102;
}
}
}
else if (words[0] == "squeak")
@@ -1214,12 +1242,18 @@ void scriptclass::run()
{
i = obj.getplayer();
game.savepoint = 0;
game.savex = obj.entities[i].xp ;
game.savey = obj.entities[i].yp;
if (i > -1)
{
game.savex = obj.entities[i].xp ;
game.savey = obj.entities[i].yp;
}
game.savegc = game.gravitycontrol;
game.saverx = game.roomx;
game.savery = game.roomy;
game.savedir = obj.entities[i].dir;
if (i > -1)
{
game.savedir = obj.entities[i].dir;
}
}
else if (words[0] == "gamestate")
{
@@ -1368,11 +1402,19 @@ void scriptclass::run()
}
else if (words[0] == "hideplayer")
{
obj.entities[obj.getplayer()].invis = true;
int player = obj.getplayer();
if (player > -1)
{
obj.entities[player].invis = true;
}
}
else if (words[0] == "showplayer")
{
obj.entities[obj.getplayer()].invis = false;
int player = obj.getplayer();
if (player > -1)
{
obj.entities[player].invis = false;
}
}
else if (words[0] == "teleportscript")
{
@@ -1433,7 +1475,10 @@ void scriptclass::run()
obj.resetallflags();
i = obj.getplayer();
obj.entities[i].tile = 0;
if (i > -1)
{
obj.entities[i].tile = 0;
}
for (i = 0; i < 100; i++)
{
@@ -1606,11 +1651,11 @@ void scriptclass::run()
j=obj.getcrewman(1);
}
if (obj.entities[j].xp > obj.entities[i].xp + 5)
if (i > -1 && j > -1 && obj.entities[j].xp > obj.entities[i].xp + 5)
{
obj.entities[i].dir = 1;
}
else if (obj.entities[j].xp < obj.entities[i].xp - 5)
else if (i > -1 && j > -1 && obj.entities[j].xp < obj.entities[i].xp - 5)
{
obj.entities[i].dir = 0;
}
@@ -1796,39 +1841,45 @@ void scriptclass::run()
else if (words[0] == "restoreplayercolour")
{
i = obj.getplayer();
obj.entities[i].colour = 0;
if (i > -1)
{
obj.entities[i].colour = 0;
}
}
else if (words[0] == "changeplayercolour")
{
i = obj.getplayer();
if (words[1] == "cyan")
if (i > -1)
{
obj.entities[i].colour = 0;
}
else if (words[1] == "red")
{
obj.entities[i].colour = 15;
}
else if (words[1] == "green")
{
obj.entities[i].colour = 13;
}
else if (words[1] == "yellow")
{
obj.entities[i].colour = 14;
}
else if (words[1] == "blue")
{
obj.entities[i].colour = 16;
}
else if (words[1] == "purple")
{
obj.entities[i].colour = 20;
}
else if (words[1] == "teleporter")
{
obj.entities[i].colour = 102;
if (words[1] == "cyan")
{
obj.entities[i].colour = 0;
}
else if (words[1] == "red")
{
obj.entities[i].colour = 15;
}
else if (words[1] == "green")
{
obj.entities[i].colour = 13;
}
else if (words[1] == "yellow")
{
obj.entities[i].colour = 14;
}
else if (words[1] == "blue")
{
obj.entities[i].colour = 16;
}
else if (words[1] == "purple")
{
obj.entities[i].colour = 20;
}
else if (words[1] == "teleporter")
{
obj.entities[i].colour = 102;
}
}
}
else if (words[0] == "altstates")
@@ -2585,7 +2636,10 @@ void scriptclass::startgamemode( int t )
map.resetplayer();
i = obj.getplayer();
map.ypos = obj.entities[i].yp - 120;
if (i > -1)
{
map.ypos = obj.entities[i].yp - 120;
}
map.bypos = map.ypos / 2;
map.cameramode = 0;
map.colsuperstate = 0;
@@ -3278,9 +3332,12 @@ void scriptclass::teleport()
game.companion = 0;
i = obj.getplayer(); //less likely to have a serious collision error if the player is centered
obj.entities[i].xp = 150;
obj.entities[i].yp = 110;
if(game.teleport_to_x==17 && game.teleport_to_y==17) obj.entities[i].xp = 88; //prevent falling!
if (i > -1)
{
obj.entities[i].xp = 150;
obj.entities[i].yp = 110;
if(game.teleport_to_x==17 && game.teleport_to_y==17) obj.entities[i].xp = 88; //prevent falling!
}
if (game.teleportscript == "levelonecomplete")
{
@@ -3312,7 +3369,11 @@ void scriptclass::teleport()
game.saverx = game.roomx;
game.savery = game.roomy;
game.savedir = obj.entities[obj.getplayer()].dir;
int player = obj.getplayer();
if (player > -1)
{
game.savedir = obj.entities[player].dir;
}
if(game.teleport_to_x==0 && game.teleport_to_y==0)
{