zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 12:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- prevented crashes caused by inconsistent status bar

Browse source 
Incorrectly initialized or deliberately broken status bar could lead to integer division by zero and null pointer dereference

class BuggyStatusBar : DoomStatusBar
{
    override void Init()
    {
        // No super.Init()
    }
}
This commit is contained in:
alexey.lysiuk 2018-06-17 14:35:25 +03:00
parent f2918b748f
commit 832de42c24
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/g_statusbar/shared_sbar.cpp
View file

@ -349,8 +349,25 @@ DBaseStatusBar::DBaseStatusBar ()
defaultScale = { (double)CleanXfac, (double)CleanYfac }; defaultScale = { (double)CleanXfac, (double)CleanYfac };
} }
static void ValidateResolution(int &hres, int &vres)
{
if (hres == 0)
{
static const int HORIZONTAL_RESOLUTION_DEFAULT = 320;
hres = HORIZONTAL_RESOLUTION_DEFAULT;
}
if (vres == 0)
{
static const int VERTICAL_RESOLUTION_DEFAULT = 200;
vres = VERTICAL_RESOLUTION_DEFAULT;
}
}
void DBaseStatusBar::SetSize(int reltop, int hres, int vres, int hhres, int hvres) void DBaseStatusBar::SetSize(int reltop, int hres, int vres, int hhres, int hvres)
{ {
ValidateResolution(hres, vres);
BaseRelTop = reltop; BaseRelTop = reltop;
BaseSBarHorizontalResolution = hres; BaseSBarHorizontalResolution = hres;
BaseSBarVerticalResolution = vres; BaseSBarVerticalResolution = vres;
@ -361,6 +378,8 @@ void DBaseStatusBar::SetSize(int reltop, int hres, int vres, int hhres, int hvre
void DBaseStatusBar::SetDrawSize(int reltop, int hres, int vres) void DBaseStatusBar::SetDrawSize(int reltop, int hres, int vres)
{ {
ValidateResolution(hres, vres);
RelTop = reltop; RelTop = reltop;
HorizontalResolution = hres; HorizontalResolution = hres;
VerticalResolution = vres; VerticalResolution = vres;
@ -415,6 +434,8 @@ void DBaseStatusBar::OnDestroy ()
void DBaseStatusBar::SetScale () void DBaseStatusBar::SetScale ()
{ {
ValidateResolution(HorizontalResolution, VerticalResolution);
int w = SCREENWIDTH; int w = SCREENWIDTH;
int h = SCREENHEIGHT; int h = SCREENHEIGHT;
if (st_scale < 0 || ForcedScale) if (st_scale < 0 || ForcedScale)
@ -481,10 +502,14 @@ DVector2 DBaseStatusBar::GetHUDScale() const
} }
scale = GetUIScale(hud_scale); scale = GetUIScale(hud_scale);
int hres = HorizontalResolution;
int vres = VerticalResolution;
ValidateResolution(hres, vres);
// Since status bars and HUDs can be designed for non 320x200 screens this needs to be factored in here. // Since status bars and HUDs can be designed for non 320x200 screens this needs to be factored in here.
// The global scaling factors are for resources at 320x200, so if the actual ones are higher resolution // The global scaling factors are for resources at 320x200, so if the actual ones are higher resolution
// the resulting scaling factor needs to be reduced accordingly. // the resulting scaling factor needs to be reduced accordingly.
int realscale = MAX<int>(1, (320 * scale) / HorizontalResolution); int realscale = MAX<int>(1, (320 * scale) / hres);
return{ double(realscale), double(realscale * (hud_aspectscale ? 1.2 : 1.)) }; return{ double(realscale), double(realscale * (hud_aspectscale ? 1.2 : 1.)) };
} }
@ -1439,7 +1464,11 @@ void DBaseStatusBar::StatusbarToRealCoords(double &x, double &y, double &w, doub
{ {
if (SBarScale.X == -1 || ForcedScale) if (SBarScale.X == -1 || ForcedScale)
{ {
screen->VirtualToRealCoords(x, y, w, h, HorizontalResolution, VerticalResolution, true, true); int hres = HorizontalResolution;
int vres = VerticalResolution;
ValidateResolution(hres, vres);
screen->VirtualToRealCoords(x, y, w, h, hres, vres, true, true);
} }
else else
{ {
@ -1802,7 +1831,7 @@ void DBaseStatusBar::DrawString(FFont *font, const FString &cstring, double x, d
DEFINE_ACTION_FUNCTION(DBaseStatusBar, DrawString) DEFINE_ACTION_FUNCTION(DBaseStatusBar, DrawString)
{ {
PARAM_SELF_PROLOGUE(DBaseStatusBar); PARAM_SELF_PROLOGUE(DBaseStatusBar);
PARAM_POINTER(font, DHUDFont); PARAM_POINTER_NOT_NULL(font, DHUDFont);
PARAM_STRING(string); PARAM_STRING(string);
PARAM_FLOAT(x); PARAM_FLOAT(x);
PARAM_FLOAT(y); PARAM_FLOAT(y);