[MiNT] patch:XaAES:xa_rsrc

["Helmut Karlowski" <hk10@gmx.de>]

----------------------------------------------------------------------------------
added another sanity-check while loading a resource-file
----------------------------------------------------------------------------------


diff -u -B -I '$Id' src.cvs/xa_rsrc.c src.km/xa_rsrc.c
--- src.cvs/xa_rsrc.c	2010-01-04 23:31:12.000000000 +0100
+++ src.km/xa_rsrc.c	2010-01-13 22:28:28.375000000 +0100
@@ -751,6 +751,7 @@
 	RSHDR *hdr = NULL;
 	CICONBLK **cibh = NULL;
 	unsigned long osize = 0, size = 0, extra = 0;
+	unsigned long sz;
 	char *base = NULL, *end = NULL;
 	char *extra_ptr = NULL;
 	struct xa_rscs *rscs = NULL; 
@@ -813,7 +814,7 @@
 			extra_ptr = base + fsize + sizeof(RSXHDR);
 		}
 
-		size = kernel_read(f, base, fsize);
+		sz = size = kernel_read(f, base, fsize);
 		kernel_close(f);
 		if (size != fsize)
 		{
@@ -833,6 +834,17 @@
 		{
 			size = *(unsigned long *)(base + osize);
 		}
+		BLOG((0,"LoadResources:%s: size: (%ld,%ld)", fname, sz, size ));
+		if( size != sz )
+		{
+			DIAG((D_rsrc, client, "LoadResource(): Error loading file (size mismatch)"));
+			BLOG((1,"LoadResources:%s: wrong size (%ld,%ld)!", fname, sz, size ));
+			if (client == C.Aes || client == C.Hlp)
+				kfree(base);
+			else
+				ufree(base);
+			return NULL;
+		}
 		end = base + size;
 		/*
 		 * Ozk: Added 'flags' to xa_rscs structure, so we know
@@ -863,6 +875,15 @@
 			osize = (size + 1UL) & 0xfffffffeUL;
 			if (hdr->rsh_vrsn & 4)
 				size = *(unsigned long *)(base + osize);
+
+			/*	no chance to check for correct rsc-size if loaded from memory!
+			BLOG((0,"LoadResources:%s: size (%ld,%ld)!", fname, sz, size ));
+			if( size > sz )
+			{
+				BLOG((1,"LoadResources:%s: wrong size (%ld,%ld)!", fname, sz, size ));
+				return NULL;
+			}
+			*/
 			client->rsct++;
 			rscs = list_resource(client, base, 0);
 			end = base + size;
@@ -979,7 +1000,7 @@
 	fix_objects(client, rscs, cibh, vdih, base, (OBJECT *)(base + hdr->rsh_object), hdr->rsh_nobs);
 
 	fix_trees(client, base, (OBJECT **)(base + hdr->rsh_trindex), hdr->rsh_ntree, designWidth, designHeight);
-	
+
 	return (RSHDR *)base;
 }