* Fix to potential out of range index bug from misanthropia

ioquake · Oct 20, 2005 · 64f167f · 64f167f
1 parent 769372e
commit 64f167f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
@@ -2566,7 +2566,14 @@ qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_
 	shader_t	*sh;
 
 	hash = generateHashValue(name, FILE_HASH_SIZE);
-
+
+	// 20051020 misantropia -- probably not necessary since this function
+	// only gets called from tr_font.c with lightmapIndex == LIGHTMAP_2D
+	// but better safe than sorry.
+	if ( lightmapIndex >= tr.numLightmaps ) {
+		lightmapIndex = LIGHTMAP_WHITEIMAGE;
+	}
+
 	//
 	// see if the shader is already loaded
 	//