mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 18:19:43 +01:00
Code Issues Releases Wiki Activity

Fix indexing out-of-bounds with font printing functions

Browse source 
If you don't have a font.txt, it could happen that a font index is
requested that's out-of-bounds. And that would result in a segfault. So
to fix that I'm adding INBOUNDS checks to all functions that index the
fontmap.
This commit is contained in:
Misa 2020-06-13 18:56:59 -07:00 committed by Ethan Lee
parent 3b0ec54164
commit 2d49988f5d
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
desktop_version/src/Graphics.cpp
View file

@ -274,6 +274,7 @@ void Graphics::PrintAlpha( int _x, int _y, std::string _s, int r, int g, int b,
_x = ((160 ) - ((len(_s)) / 2)); _x = ((160 ) - ((len(_s)) / 2));
int bfontpos = 0; int bfontpos = 0;
int curr; int curr;
int idx;
std::string::iterator iter = _s.begin(); std::string::iterator iter = _s.begin();
while (iter != _s.end()) { while (iter != _s.end()) {
curr = utf8::unchecked::next(iter); curr = utf8::unchecked::next(iter);
@ -285,7 +286,11 @@ void Graphics::PrintAlpha( int _x, int _y, std::string _s, int r, int g, int b,
fontRect.x = tpoint.x ; fontRect.x = tpoint.x ;
fontRect.y = tpoint.y ; fontRect.y = tpoint.y ;
BlitSurfaceColoured( font[font_idx(curr)], NULL, backBuffer, &fontRect , ct); idx = font_idx(curr);
if (INBOUNDS(idx, font))
{
BlitSurfaceColoured( font[idx], NULL, backBuffer, &fontRect , ct);
}
bfontpos+=bfontlen(curr) ; bfontpos+=bfontlen(curr) ;
} }
} }
@ -308,6 +313,7 @@ void Graphics::bigprint( int _x, int _y, std::string _s, int r, int g, int b, b
int bfontpos = 0; int bfontpos = 0;
int curr; int curr;
int idx;
std::string::iterator iter = _s.begin(); std::string::iterator iter = _s.begin();
while (iter != _s.end()) { while (iter != _s.end()) {
curr = utf8::unchecked::next(iter); curr = utf8::unchecked::next(iter);
@ -322,10 +328,14 @@ void Graphics::bigprint( int _x, int _y, std::string _s, int r, int g, int b, b
fontRect.y = tpoint.y ; fontRect.y = tpoint.y ;
*/ */
SDL_Surface* tempPrint = ScaleSurfaceSlow(font[font_idx(curr)], font[font_idx(curr)]->w *sc,font[font_idx(curr)]->h *sc); idx = font_idx(curr);
if (INBOUNDS(idx, font))
{
SDL_Surface* tempPrint = ScaleSurfaceSlow(font[idx], font[idx]->w *sc,font[idx]->h *sc);
SDL_Rect printrect = { static_cast<Sint16>((_x) + bfontpos), static_cast<Sint16>(_y) , static_cast<Sint16>((bfont_rect.w*sc)+1), static_cast<Sint16>((bfont_rect.h * sc)+1)}; SDL_Rect printrect = { static_cast<Sint16>((_x) + bfontpos), static_cast<Sint16>(_y) , static_cast<Sint16>((bfont_rect.w*sc)+1), static_cast<Sint16>((bfont_rect.h * sc)+1)};
BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct); BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct);
SDL_FreeSurface(tempPrint); SDL_FreeSurface(tempPrint);
}
bfontpos+=bfontlen(curr) *sc; bfontpos+=bfontlen(curr) *sc;
} }
} }
@ -359,6 +369,7 @@ void Graphics::PrintOffAlpha( int _x, int _y, std::string _s, int r, int g, int
if (cen) if (cen)
_x = ((160) - (len(_s) / 2))+_x; _x = ((160) - (len(_s) / 2))+_x;
int bfontpos = 0; int bfontpos = 0;
int idx;
std::string::iterator iter = _s.begin(); std::string::iterator iter = _s.begin();
while (iter != _s.end()) { while (iter != _s.end()) {
int curr = utf8::unchecked::next(iter); int curr = utf8::unchecked::next(iter);
@ -370,7 +381,11 @@ void Graphics::PrintOffAlpha( int _x, int _y, std::string _s, int r, int g, int
fontRect.x = tpoint.x ; fontRect.x = tpoint.x ;
fontRect.y = tpoint.y ; fontRect.y = tpoint.y ;
BlitSurfaceColoured( font[font_idx(curr)], NULL, backBuffer, &fontRect , ct); idx = font_idx(curr);
if (INBOUNDS(idx, font))
{
BlitSurfaceColoured( font[idx], NULL, backBuffer, &fontRect , ct);
}
bfontpos+=bfontlen(curr) ; bfontpos+=bfontlen(curr) ;
} }
} }
@ -413,6 +428,7 @@ void Graphics::RPrint( int _x, int _y, std::string _s, int r, int g, int b, bool
_x = ((308) - (_s.length() / 2)); _x = ((308) - (_s.length() / 2));
int bfontpos = 0; int bfontpos = 0;
int curr; int curr;
int idx;
std::string::iterator iter = _s.begin(); std::string::iterator iter = _s.begin();
while (iter != _s.end()) { while (iter != _s.end()) {
curr = utf8::unchecked::next(iter); curr = utf8::unchecked::next(iter);
@ -424,7 +440,11 @@ void Graphics::RPrint( int _x, int _y, std::string _s, int r, int g, int b, bool
fontRect.x = tpoint.x ; fontRect.x = tpoint.x ;
fontRect.y = tpoint.y ; fontRect.y = tpoint.y ;
BlitSurfaceColoured( font[font_idx(curr)], NULL, backBuffer, &fontRect , ct); idx = font_idx(curr);
if (INBOUNDS(idx, font))
{
BlitSurfaceColoured( font[idx], NULL, backBuffer, &fontRect , ct);
}
bfontpos+=bfontlen(curr) ; bfontpos+=bfontlen(curr) ;
} }
} }
@ -2752,13 +2772,18 @@ void Graphics::bigrprint(int x, int y, std::string& t, int r, int g, int b, bool
int bfontpos = 0; int bfontpos = 0;
int cur; int cur;
int idx;
std::string::iterator iter = t.begin(); std::string::iterator iter = t.begin();
while (iter != t.end()) { while (iter != t.end()) {
cur = utf8::unchecked::next(iter); cur = utf8::unchecked::next(iter);
SDL_Surface* tempPrint = ScaleSurfaceSlow(font[font_idx(cur)], font[font_idx(cur)]->w *sc,font[font_idx(cur)]->h *sc); idx = font_idx(cur);
if (INBOUNDS(idx, font))
{
SDL_Surface* tempPrint = ScaleSurfaceSlow(font[idx], font[idx]->w *sc,font[idx]->h *sc);
SDL_Rect printrect = { Sint16((x) + bfontpos), Sint16(y) , Sint16(bfont_rect.w*sc), Sint16(bfont_rect.h * sc)}; SDL_Rect printrect = { Sint16((x) + bfontpos), Sint16(y) , Sint16(bfont_rect.w*sc), Sint16(bfont_rect.h * sc)};
BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct); BlitSurfaceColoured(tempPrint, NULL, backBuffer, &printrect, ct);
SDL_FreeSurface(tempPrint); SDL_FreeSurface(tempPrint);
}
bfontpos+=bfontlen(cur)* sc; bfontpos+=bfontlen(cur)* sc;
} }
} }