jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Perform bounds checking on values passed to TXT_UpdateScreenArea() to

Browse source 
avoid crashes.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1728
This commit is contained in:
Simon Howard 2009-11-05 19:57:55 +00:00
parent 3771126689
commit 9ea3cb62c9
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
textscreen/txt_sdl.c
View file

@ -263,19 +263,44 @@ static inline void UpdateCharacter(int x, int y)
}
}
static int LimitToRange(int val, int min, int max)
{
if (val < min)
{
return min;
}
else if (val > max)
{
return max;
}
else
{
return val;
}
}
void TXT_UpdateScreenArea(int x, int y, int w, int h)
{
int x1, y1;
int x_end;
int y_end;
for (y1=y; y1<y+h; ++y1)
x_end = LimitToRange(x + w, 0, TXT_SCREEN_W - 1);
y_end = LimitToRange(y + h, 0, TXT_SCREEN_H - 1);
x = LimitToRange(x, 0, TXT_SCREEN_W - 1);
y = LimitToRange(y, 0, TXT_SCREEN_H - 1);
for (y1=y; y1<y_end; ++y1)
{
for (x1=x; x1<x+w; ++x1)
for (x1=x; x1<x_end; ++x1)
{
UpdateCharacter(x1, y1);
}
}
SDL_UpdateRect(screen, x * font->w, y * font->h, w * font->w, h * font->h);
SDL_UpdateRect(screen,
x * font->w, y * font->h,
(x_end - x) * font->w, (y_end - y) * font->h);
}
void TXT_UpdateScreen(void)