zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed fuzz drawer crash

This commit is contained in:
Magnus Norddahl 2016-06-26 06:54:32 +02:00
parent 3b6d177787
commit 4fd127651d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/r_draw_rgba.cpp
View File

@ -826,7 +826,10 @@ public:
// Handle the case where we would go out of bounds at the top: // Handle the case where we would go out of bounds at the top:
if (yl < fuzzstep) if (yl < fuzzstep)
{ {
uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep + pitch]; uint32_t *srcdest = dest + fuzzoffset[fuzz] * fuzzstep + pitch;
//assert(static_cast<int>((srcdest - (uint32_t*)dc_destorg) / (_pitch)) < viewheight);
uint32_t bg = *srcdest;
uint32_t red = RPART(bg) * 3 / 4; uint32_t red = RPART(bg) * 3 / 4;
uint32_t green = GPART(bg) * 3 / 4; uint32_t green = GPART(bg) * 3 / 4;
@ -842,7 +845,7 @@ public:
return; return;
} }
bool lowerbounds = (yl + count * fuzzstep > _fuzzviewheight); bool lowerbounds = (yl + (count + fuzzstep - 1) * fuzzstep > _fuzzviewheight);
if (lowerbounds) if (lowerbounds)
count--; count--;
@ -858,7 +861,10 @@ public:
count -= cnt; count -= cnt;
do do
{ {
uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep]; uint32_t *srcdest = dest + fuzzoffset[fuzz] * fuzzstep;
//assert(static_cast<int>((srcdest - (uint32_t*)dc_destorg) / (_pitch)) < viewheight);
uint32_t bg = *srcdest;
uint32_t red = RPART(bg) * 3 / 4; uint32_t red = RPART(bg) * 3 / 4;
uint32_t green = GPART(bg) * 3 / 4; uint32_t green = GPART(bg) * 3 / 4;
@ -875,7 +881,10 @@ public:
// Handle the case where we would go out of bounds at the bottom // Handle the case where we would go out of bounds at the bottom
if (lowerbounds) if (lowerbounds)
{ {
uint32_t bg = dest[fuzzoffset[fuzz] * fuzzstep - pitch]; uint32_t *srcdest = dest + fuzzoffset[fuzz] * fuzzstep - pitch;
//assert(static_cast<int>((srcdest - (uint32_t*)dc_destorg) / (_pitch)) < viewheight);
uint32_t bg = *srcdest;
uint32_t red = RPART(bg) * 3 / 4; uint32_t red = RPART(bg) * 3 / 4;
uint32_t green = GPART(bg) * 3 / 4; uint32_t green = GPART(bg) * 3 / 4;