zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 05:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added DetectRangeError function

Browse source
This commit is contained in:
Magnus Norddahl 2016-10-17 12:36:01 +02:00
parent c9a9e93c66
commit af937366d1
7 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/r_draw.cpp
View file

@ -64,6 +64,7 @@ BYTE* viewimage;
extern "C" {
int ylookup[MAXHEIGHT];
BYTE *dc_destorg;
int dc_destheight;
}
int scaledviewwidth;

1
src/r_draw.h
View file

@ -76,6 +76,7 @@ extern "C" const BYTE* dc_source2;
extern "C" uint32_t dc_texturefracx;
extern "C" BYTE *dc_dest, *dc_destorg;
extern "C" int dc_destheight;
extern "C" int dc_count;
extern "C" DWORD vplce[4];

8
src/r_draw_rgba.cpp
View file

@ -245,6 +245,8 @@ public:
args.flags |= DrawWallArgs::simple_shade;
if (args.source2[0] == nullptr)
args.flags |= DrawWallArgs::nearest_filter;
DetectRangeError(args.dest, args.dest_y, args.count);
}
void Execute(DrawerThread *thread) override
@ -304,6 +306,8 @@ public:
args.flags |= DrawWallArgs::simple_shade;
if (args.source2[0] == nullptr)
args.flags |= DrawWallArgs::nearest_filter;
DetectRangeError(args.dest, args.dest_y, args.count);
}
void Execute(DrawerThread *thread) override
@ -368,6 +372,8 @@ public:
args.flags = 0;
if (dc_shade_constants.simple_shade)
args.flags |= DrawColumnArgs::simple_shade;
DetectRangeError(args.dest, args.dest_y, args.count);
}
void Execute(DrawerThread *thread) override
@ -410,6 +416,8 @@ public:
args.textureheight1 = bufheight[1];
args.top_color = solid_top;
args.bottom_color = solid_bottom;
DetectRangeError(args.dest, args.dest_y, args.count);
}
FString DebugInfo() override

2
src/r_drawt_rgba.cpp
View file

@ -97,6 +97,8 @@ public:
args.flags = 0;
if (dc_shade_constants.simple_shade)
args.flags |= DrawColumnArgs::simple_shade;
DetectRangeError(args.dest, args.dest_y, args.count);
}
void Execute(DrawerThread *thread) override

1
src/r_main.cpp
View file

@ -823,6 +823,7 @@ void R_SetupBuffer ()
#endif
}
dc_destorg = lineptr;
dc_destheight = RenderTarget->GetHeight() - viewwindowy;
for (int i = 0; i < RenderTarget->GetHeight(); i++)
{
ylookup[i] = i * pitch;

24
src/r_thread.h
View file

@ -72,6 +72,30 @@ class DrawerCommand
protected:
int _dest_y;
void DetectRangeError(uint32_t *&dest, int &dest_y, int &count)
{
#if defined(_MSC_VER) && defined(_DEBUG)
if (dest_y < 0 || count < 0 || dest_y + count > dc_destheight)
__debugbreak(); // Buffer overrun detected!
#endif
if (dest_y < 0)
{
count += dest_y;
dest_y = 0;
dest = (uint32_t*)dc_destorg;
}
else if (dest_y >= dc_destheight)
{
dest_y = 0;
count = 0;
}
if (count < 0 || count > MAXHEIGHT) count = 0;
if (dest_y + count >= dc_destheight)
count = dc_destheight - dest_y;
}
public:
DrawerCommand()
{

3
src/v_draw.cpp
View file

@ -204,7 +204,9 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
mode = R_SetPatchStyle(parms.style, parms.Alpha, 0, parms.fillcolor);
BYTE *destorgsave = dc_destorg;
int destheightsave = dc_destheight;
dc_destorg = screen->GetBuffer();
dc_destheight = screen->GetHeight();
if (dc_destorg == NULL)
{
I_FatalError("Attempt to write to buffer of hardware canvas");
@ -362,6 +364,7 @@ void DCanvas::DrawTextureParms(FTexture *img, DrawParms &parms)
R_FinishSetPatchStyle ();
dc_destorg = destorgsave;
dc_destheight = destheightsave;
if (ticdup != 0 && menuactive == MENU_Off)
{