eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Make sure bad q2 layout strings won't go out of bounds. Add dev2 prints for bad layout string commands (there's probably lots of bad q2 mods out there, hence not dev1/unconditional).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6336 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2023-01-09 05:14:44 +00:00
parent fb4531ea6c
commit 62622491f0
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
engine/client/sbar.c
View file

@ -411,38 +411,38 @@ void Sbar_ExecuteLayoutString (char *s, int seat)
{ {
s = COM_Parse (s); s = COM_Parse (s);
if (!strcmp(com_token, "xl")) if (!strcmp(com_token, "xl"))
{ { //relative to left
s = COM_Parse (s); s = COM_Parse (s);
x = sbar_rect.x + atoi(com_token); x = sbar_rect.x + atoi(com_token);
continue; continue;
} }
if (!strcmp(com_token, "xr")) if (!strcmp(com_token, "xr"))
{ { //relative to right
s = COM_Parse (s); s = COM_Parse (s);
x = sbar_rect.x + sbar_rect.width + atoi(com_token); x = sbar_rect.x + sbar_rect.width + atoi(com_token);
continue; continue;
} }
if (!strcmp(com_token, "xv")) if (!strcmp(com_token, "xv"))
{ { //relative to central 640*480 box.
s = COM_Parse (s); s = COM_Parse (s);
x = sbar_rect.x + (sbar_rect.width-320)/2 + atoi(com_token); x = sbar_rect.x + (sbar_rect.width-320)/2 + atoi(com_token);
continue; continue;
} }
if (!strcmp(com_token, "yt")) if (!strcmp(com_token, "yt"))
{ { //relative to top
s = COM_Parse (s); s = COM_Parse (s);
y = sbar_rect.y + atoi(com_token); y = sbar_rect.y + atoi(com_token);
continue; continue;
} }
if (!strcmp(com_token, "yb")) if (!strcmp(com_token, "yb"))
{ { //relative to bottom
s = COM_Parse (s); s = COM_Parse (s);
y = sbar_rect.y + sbar_rect.height + atoi(com_token); y = sbar_rect.y + sbar_rect.height + atoi(com_token);
continue; continue;
} }
if (!strcmp(com_token, "yv")) if (!strcmp(com_token, "yv"))
{ { //relative to central 640*480 box.
s = COM_Parse (s); s = COM_Parse (s);
y = sbar_rect.y + (sbar_rect.height-240)/2 + atoi(com_token); y = sbar_rect.y + (sbar_rect.height-240)/2 + atoi(com_token);
continue; continue;
@ -451,7 +451,10 @@ void Sbar_ExecuteLayoutString (char *s, int seat)
if (!strcmp(com_token, "pic")) if (!strcmp(com_token, "pic"))
{ // draw a pic from a stat number { // draw a pic from a stat number
s = COM_Parse (s); s = COM_Parse (s);
value = ps->stats[atoi(com_token)]; index = atoi(com_token);
if (index < 0 || index >= countof(ps->stats))
Host_EndGame ("Bad stat index");
value = ps->stats[index];
if (value >= Q2MAX_IMAGES || value < 0) if (value >= Q2MAX_IMAGES || value < 0)
Host_EndGame ("Pic >= Q2MAX_IMAGES"); Host_EndGame ("Pic >= Q2MAX_IMAGES");
if (*Get_Q2ConfigString(Q2CS_IMAGES+value)) if (*Get_Q2ConfigString(Q2CS_IMAGES+value))
@ -553,7 +556,10 @@ void Sbar_ExecuteLayoutString (char *s, int seat)
s = COM_Parse (s); s = COM_Parse (s);
width = atoi(com_token); width = atoi(com_token);
s = COM_Parse (s); s = COM_Parse (s);
value = ps->stats[atoi(com_token)]; index = atoi(com_token);
if (index < 0 || index >= countof(ps->stats))
Host_EndGame ("Bad stat index");
value = ps->stats[index];
SCR_DrawField (x, y, 0, width, value); SCR_DrawField (x, y, 0, width, value);
continue; continue;
} }
@ -669,7 +675,10 @@ void Sbar_ExecuteLayoutString (char *s, int seat)
if (!strcmp(com_token, "if")) if (!strcmp(com_token, "if"))
{ // draw a number { // draw a number
s = COM_Parse (s); s = COM_Parse (s);
value = ps->stats[atoi(com_token)]; index = atoi(com_token);
if (index < 0 || index >= countof(ps->stats))
Host_EndGame ("Bad stat index");
value = ps->stats[index];
if (!value) if (!value)
{ // skip to endif { // skip to endif
while (s && strcmp(com_token, "endif") ) while (s && strcmp(com_token, "endif") )
@ -680,8 +689,16 @@ void Sbar_ExecuteLayoutString (char *s, int seat)
continue; continue;
} }
if (!strcmp(com_token, "endif"))
{ //conditional was taken (so its endif wasn't ignored)
continue;
}
if (*com_token)
{
static float throttle;
Con_ThrottlePrintf(&throttle, 2, "Unknown layout command \"%s\"\n", com_token);
}
} }
} }