Merge branch 'repeatmasked-overflow-fix' into 'next'

Prevent infinite loop in R_RenderThickSideRange

See merge request STJr/SRB2!2470
This commit is contained in:
Lactozilla 2024-06-02 20:21:16 +00:00
commit 021e461813

View file

@ -469,7 +469,7 @@ static void R_DrawRepeatMaskedColumn(column_t *col, unsigned lengthcol)
R_DrawMaskedColumn(col, lengthcol);
if ((INT64)topscreen + (INT64)texheight > (INT64)INT32_MAX) // prevent overflow
if ((INT64)sprtopscreen + (INT64)dc_texheight*spryscale > (INT64)INT32_MAX) // prevent overflow
break;
topscreen += texheight;
@ -504,7 +504,7 @@ static void R_DrawRepeatFlippedMaskedColumn(column_t *col, unsigned lengthcol)
R_DrawFlippedMaskedColumn(col, lengthcol);
if ((INT64)topscreen + (INT64)texheight > (INT64)INT32_MAX) // prevent overflow
if ((INT64)sprtopscreen + (INT64)dc_texheight*spryscale > (INT64)INT32_MAX) // prevent overflow
break;
topscreen += texheight;