From 3c79c6229ca52d6e0ddd787861bdf4662a8dd1be Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sat, 24 Jan 2009 19:19:24 +0000
Subject: fix near-infinite loop and segfault in ARM costume asm when len == 0
 (should fix #2340221)

svn-id: r36039
---
 engines/scumm/proc3ARM.s | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s
index cefe37153e..e3c20cc05c 100644
--- a/engines/scumm/proc3ARM.s
+++ b/engines/scumm/proc3ARM.s
@@ -198,7 +198,8 @@ middleloop:
 	@ r14= len
 
 	MOV	r5,r12		@ loopCount = height
-	CMP	r5,r14		@ if (loopCount > len)
+	CMP	r14,#0
+	CMPNE	r5,r14		@ if (len != 0 && loopCount > len)
 	MOVGT	r5,r14		@	loopCount = len
 	SUB	r12,r12,r5	@ height -= loopCount
 	SUB	r14,r14,r5	@ len    -= loopCount
-- 
cgit v1.2.3