X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=1f15a2fce253d4d330d7edb1e05d5935d800222d;hb=dd2a594d99d1a37d873929f573100736d7d1d86d;hp=58f7c053234b58f1de69363ef0618389a1887fe9;hpb=75baaab0958be44cdc1b521045cc72ffac7e6c5a;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 58f7c053..1f15a2fc 100644
--- a/image.c
+++ b/image.c
@@ -436,6 +436,8 @@ unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize, int *miplevel
 		return NULL;
 	}
 
+	memset(palettei, 0, sizeof(palettei));
+
 	// advance to end of header
 	fin = f + 18;
 
@@ -799,22 +801,36 @@ qboolean LoadWAL_GetMetadata(const unsigned char *f, int filesize, int *retwidth
 	if (filesize < (int) sizeof(q2wal_t))
 	{
 		Con_Print("LoadWAL: invalid WAL file\n");
-		*retwidth = 16;
-		*retheight = 16;
-		*retflags = 0;
-		*retvalue = 0;
-		*retcontents = 0;
-		memset(retanimname32c, 0, 32);
+		if (retwidth)
+			*retwidth = 16;
+		if (retheight)
+			*retheight = 16;
+		if (retflags)
+			*retflags = 0;
+		if (retvalue)
+			*retvalue = 0;
+		if (retcontents)
+			*retcontents = 0;
+		if (retanimname32c)
+			memset(retanimname32c, 0, 32);
 		return false;
 	}
 
-	*retwidth = LittleLong(inwal->width);
-	*retheight = LittleLong(inwal->height);
-	*retflags = LittleLong(inwal->flags);
-	*retvalue = LittleLong(inwal->value);
-	*retcontents = LittleLong(inwal->contents);
-	memcpy(retanimname32c, inwal->animname, 32);
-	retanimname32c[31] = 0;
+	if (retwidth)
+		*retwidth = LittleLong(inwal->width);
+	if (retheight)
+		*retheight = LittleLong(inwal->height);
+	if (retflags)
+		*retflags = LittleLong(inwal->flags);
+	if (retvalue)
+		*retvalue = LittleLong(inwal->value);
+	if (retcontents)
+		*retcontents = LittleLong(inwal->contents);
+	if (retanimname32c)
+	{
+		memcpy(retanimname32c, inwal->animname, 32);
+		retanimname32c[31] = 0;
+	}
 	return true;
 }