From 70a72baabcfe77c08b8cd27742d5ca56ec693a77 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Tue, 10 May 2016 20:19:42 +0100
Subject: [PATCH] Revert texturepresent size increase, check for negative
top/mid/bottom texture values so as to not go out of bounds the other way
---
src/r_data.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/r_data.c b/src/r_data.c
index 34141489f9..6e162587b2 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1604,17 +1604,17 @@ void R_PrecacheLevel(void)
//
// no need to precache all software textures in 3D mode
// (note they are still used with the reference software view)
- texturepresent = calloc(numtextures+1, sizeof (*texturepresent));
+ texturepresent = calloc(numtextures, sizeof (*texturepresent));
if (texturepresent == NULL) I_Error("%s: Out of memory looking up textures", "R_PrecacheLevel");
for (j = 0; j < numsides; j++)
{
// huh, a potential bug here????
- if (sides[j].toptexture < numtextures)
+ if (sides[j].toptexture >= 0 && sides[j].toptexture < numtextures)
texturepresent[sides[j].toptexture] = 1;
- if (sides[j].midtexture < numtextures)
+ if (sides[j].midtexture >= 0 && sides[j].midtexture < numtextures)
texturepresent[sides[j].midtexture] = 1;
- if (sides[j].bottomtexture < numtextures)
+ if (sides[j].bottomtexture >= 0 && sides[j].bottomtexture < numtextures)
texturepresent[sides[j].bottomtexture] = 1;
}
--
GitLab