From 793ccff6e68c4045af6888f7f166b1f8fa08895d Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 9 Jun 2025 19:02:48 +0200 Subject: [PATCH] fix the goddamn portal use after free https://git.do.srb2.org/STJr/SRB2/-/commit/f536ab34674fb8d3ee262a0009753f552074305c --- src/r_segs.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 53d155705..7bb80f6b1 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -1679,6 +1679,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) { size_t pos = lastopening - openings; size_t need = (rw_stopx - start)*4 + pos; + if (need > maxopenings) { drawseg_t *ds; //needed for fix from *cough* zdoom *cough* @@ -1697,9 +1698,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) // borrowed fix from *cough* zdoom *cough* // [RH] We also need to adjust the openings pointers that // were already stored in drawsegs. - for (ds = curdrawsegs; ds < ds_p; ds++) + for (ds = drawsegs; ds < ds_p; ds++) { -#define ADJUST(p) if (ds->p + ds->x1 >= oldopenings && ds->p + ds->x1 <= oldlast) ds->p = ds->p - oldopenings + openings; +#define ADJUST(p) if (ds->p + ds->x1 >= oldopenings && ds->p + ds->x1 <= oldlast) ds->p = (ds->p - oldopenings) + openings; ADJUST(maskedtexturecol); ADJUST(sprtopclip); ADJUST(sprbottomclip);