From: Toni Wilen <twilen@winuae.net>
Date: Thu, 9 Apr 2020 11:11:31 +0000 (+0300)
Subject: Exit if out of data or any error detected.
X-Git-Tag: 4400~80
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=f56ba5dd6877930502d97920d89ac0a2e9ae19ee;p=francis%2Fwinuae.git

Exit if out of data or any error detected.
---

diff --git a/archivers/wrp/warp.cpp b/archivers/wrp/warp.cpp
index 204235a0..6b9f94ef 100644
--- a/archivers/wrp/warp.cpp
+++ b/archivers/wrp/warp.cpp
@@ -95,6 +95,9 @@ static uae_s32 ARCunsqueeze(struct zfile *in, struct zfile *out, struct rledata
 	{
 		numnodes = xadIOGetBitsLow(&io, 16);
 
+		if (io.err)
+			return XADERR_ILLEGALDATA;
+
 		if(numnodes < 0 || numnodes >= ARCSQNUMVALS)
 			err = XADERR_DECRUNCH;
 		else
@@ -115,6 +118,9 @@ static uae_s32 ARCunsqueeze(struct zfile *in, struct zfile *out, struct rledata
 				while(i >= 0 && !io.err)
 					i = node[2*i + xadIOGetBitsLow(&io, 1)];
 
+				if (io.err)
+					return XADERR_ILLEGALDATA;
+
 				i = -(i + 1); /* decode fake node index to original data value */
 
 				if(i != ARCSQSPEOF)
@@ -441,8 +447,12 @@ struct zfile *unwarp(struct zfile *zf)
 			{
 				int i;
 				for (i = 0; i < size; i++) {
-					uae_u8 v = zfile_getc (zf);
-					putrle (v, tmpf, algo == 3 ? &rled : NULL);
+					uae_s32 v = zfile_getc(zf);
+					if (v == -1) {
+						err = XADERR_ILLEGALDATA;
+						break;
+					}
+					putrle((uae_u8)v, tmpf, algo == 3 ? &rled : NULL);
 				}
 			}
 			break;