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

Compare commits

base: Se.Cherkasov:30bdb47f8018fa4373e2cc86503f58d9a19e1403
Branches Tags
Se.Cherkasov:master Se.Cherkasov:2.4-updates Se.Cherkasov:2.3-updates
Se.Cherkasov:2.4.3 Se.Cherkasov:2.4.2 Se.Cherkasov:2.4.1 Se.Cherkasov:2.4 Se.Cherkasov:2.3.6 Se.Cherkasov:2.3.5 Se.Cherkasov:2.3.4 Se.Cherkasov:2.3.3 Se.Cherkasov:2.3.2 Se.Cherkasov:2.3.1 Se.Cherkasov:2.3 Se.Cherkasov:2.2
..
compare: Se.Cherkasov:2.4-updates
Branches Tags
Se.Cherkasov:master Se.Cherkasov:2.4-updates Se.Cherkasov:2.3-updates
Se.Cherkasov:2.4.3 Se.Cherkasov:2.4.2 Se.Cherkasov:2.4.1 Se.Cherkasov:2.4 Se.Cherkasov:2.3.6 Se.Cherkasov:2.3.5 Se.Cherkasov:2.3.4 Se.Cherkasov:2.3.3 Se.Cherkasov:2.3.2 Se.Cherkasov:2.3.1 Se.Cherkasov:2.3 Se.Cherkasov:2.2

2 Commits
30bdb47f80 ... 2.4-update

Author SHA1 Message Date
NyakoFox
cf66323721 Make sure special roomnames have enough text 
There's another crash, which is indexing out of bounds if there's
not enough text. This adds simple bounds checks for them.
 2026-02-16 11:43:24 -05:00
NyakoFox
b708b8911c Fix empty roomnames potentially crashing the game 
TinyXML2 seems to sometimes return NULL when an element has either no
text or whitespace, instead of returning an empty string. Why it does
this, I'm not sure, but I have recently learned from Dav999 that it
will crash the game. Great.
 2026-02-16 11:43:17 -05:00
2 changed files with 11 additions and 3 deletions
Expand all files Collapse all files

8
desktop_version/src/CustomLevels.cpp
View File

@@ -1387,6 +1387,10 @@ next:
{ {
name.text.push_back(std::string(text)); name.text.push_back(std::string(text));
} }
else
{
name.text.push_back(std::string(""));
}
} }
else else
{ {
@@ -1404,6 +1408,10 @@ next:
{ {
name.text.push_back(std::string(text)); name.text.push_back(std::string(text));
} }
else
{
name.text.push_back(std::string(""));
}
} }
} }
} }

6
desktop_version/src/Map.cpp
View File

@@ -214,11 +214,11 @@ void mapclass::updateroomnames(void)
if (rx == roomname->x && ry == roomname->y && (roomname->flag == -1 || (INBOUNDS_ARR(roomname->flag, obj.flags) && obj.flags[roomname->flag]))) if (rx == roomname->x && ry == roomname->y && (roomname->flag == -1 || (INBOUNDS_ARR(roomname->flag, obj.flags) && obj.flags[roomname->flag])))
{ {
roomname_special = true; roomname_special = true;
if (roomname->type == RoomnameType_STATIC) if (roomname->type == RoomnameType_STATIC && roomname->text.size() >= 1)
{ {
setroomname(roomname->text[0].c_str()); setroomname(roomname->text[0].c_str());
} }
if (roomname->type == RoomnameType_GLITCH) if (roomname->type == RoomnameType_GLITCH && roomname->text.size() >= 2)
{ {
roomname->delay--; roomname->delay--;
if (roomname->delay <= 0) if (roomname->delay <= 0)
@@ -232,7 +232,7 @@ void mapclass::updateroomnames(void)
} }
setroomname(roomname->text[roomname->progress].c_str()); setroomname(roomname->text[roomname->progress].c_str());
} }
if (roomname->type == RoomnameType_TRANSFORM) if (roomname->type == RoomnameType_TRANSFORM && roomname->text.size() >= 1)
{ {
roomname->delay--; roomname->delay--;
if (roomname->delay <= 0) if (roomname->delay <= 0)