Merge branch 'upstream'

Linux/sgml/Quakespasm.sgml

@@ -3,7 +3,7 @@
 <title>QuakeSpasm
 <toc>
 
-<em>Page last edited: September 2023.</em>
+<em>Page last edited: June 2024.</em>
 
 <sect>About<p>
 
@@ -139,6 +139,22 @@ QuakeSpasm 0.94 has support for playing the 2021 re-release content: Copy the qu
 
 <sect>Changes<p>
 
+<sect1>Changes in 0.96.2<p>
+<itemize>
+<item> Fix stack buffer overrun Mod_PolyForUnlitSurface: fixes crash when loading lim_daviddg.bsp from Liminal Spaces Jam.
+<item> Fix potential buffer overflow in progs global string functions.
+<item> Fix potential buffer overflow in Mod_LoadAliasFrame()
+<item> Optimize BoxOnPlaneSide()
+<item> Reserve enough space in PF_makestatic() for worst case scenarios.
+<item> Improve handling of huge entities in SV_FindTouchedLeafs()
+<item> Apply FOV gun scaling for r_showtris
+<item> Sliders with visible values in options menu.
+<item> Fix build in C23 mode.
+<item> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.
+<item> Thanks to Andrei Drexler, Alexey Lysiuk, Diordany van Hemert, and Jaime Moreira for patches.
+</itemize>
+</p>
+
 <sect1>Changes in 0.96.1<p>
 <itemize>
 <item> Fix demo recording as client-only after connection to server (was broken by signon changes in 0.96.0. Thanks to Jozsef Szalontai for issue report.)

MacOSX/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.96.1</string>
+	<string>0.96.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSApplicationCategoryType</key>

Quake/console.c

@@ -840,7 +840,7 @@ FindCompletion -- stevenaaus
 */
 const char *FindCompletion (const char *partial, filelist_item_t *filelist, int *nummatches_out)
 {
-	static char matched[32];
+	static char matched[40];
 	char *i_matched, *i_name;
 	filelist_item_t	*file;
 	int   init, match, plen;

Quake/gl_model.c

@@ -1150,38 +1150,28 @@ TODO: merge this into BuildSurfaceDisplayList?
 */
 static void Mod_PolyForUnlitSurface (msurface_t *fa)
 {
-	vec3_t		verts[64];
-	int			numverts, i, lindex;
+	const int	numverts = fa->numedges;
+	int		i, lindex;
 	float		*vec;
 	glpoly_t	*poly;
 	float		texscale;
 
 	if (fa->flags & (SURF_DRAWTURB | SURF_DRAWSKY))
-		texscale = (1.0/128.0); //warp animation repeats every 128
+		texscale = (1.0f/128.0f); //warp animation repeats every 128
 	else
-		texscale = (1.0/32.0); //to match r_notexture_mip
+		texscale = (1.0f/32.0f); //to match r_notexture_mip
 
-	// convert edges back to a normal polygon
-	numverts = 0;
-	for (i=0 ; i<fa->numedges ; i++)
-	{
-		lindex = loadmodel->surfedges[fa->firstedge + i];
-
-		if (lindex > 0)
-			vec = loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position;
-		else
-			vec = loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
-		VectorCopy (vec, verts[numverts]);
-		numverts++;
-	}
-
-	//create the poly
 	poly = (glpoly_t *) Hunk_Alloc (sizeof(glpoly_t) + (numverts-4) * VERTEXSIZE*sizeof(float));
 	poly->next = NULL;
 	fa->polys = poly;
 	poly->numverts = numverts;
-	for (i=0, vec=(float *)verts; i<numverts; i++, vec+= 3)
+	for (i=0; i<numverts; i++)
 	{
+		lindex = loadmodel->surfedges[fa->firstedge + i];
+		vec = (lindex > 0) ?
+			loadmodel->vertexes[loadmodel->edges[lindex].v[0]].position :
+			loadmodel->vertexes[loadmodel->edges[-lindex].v[1]].position;
+
 		VectorCopy (vec, poly->verts[i]);
 		poly->verts[i][3] = DotProduct(vec, fa->texinfo->vecs[0]) * texscale;
 		poly->verts[i][4] = DotProduct(vec, fa->texinfo->vecs[1]) * texscale;

Quake/quakedef.h

@@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define	FITZQUAKE_VERSION	0.85	//johnfitz
 #define	QUAKESPASM_VERSION	0.96
-#define	QUAKESPASM_VER_PATCH	1	// helper to print a string like 0.94.7
+#define	QUAKESPASM_VER_PATCH	2	// helper to print a string like 0.94.7
 #ifndef	QUAKESPASM_VER_SUFFIX
 #define	QUAKESPASM_VER_SUFFIX		// optional version suffix string literal like "-beta1"
 #endif