[Scummvm-cvs-logs] SF.net SVN: scummvm:[36039] scummvm/trunk/engines/scumm/proc3ARM.s

[wjpalenstijn at users.sourceforge.net]

Revision: 36039
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36039&view=rev
Author:   wjpalenstijn
Date:     2009-01-24 19:19:24 +0000 (Sat, 24 Jan 2009)

Log Message:
-----------
fix near-infinite loop and segfault in ARM costume asm when len == 0 (should fix #2340221)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/proc3ARM.s

Modified: scummvm/trunk/engines/scumm/proc3ARM.s
===================================================================
--- scummvm/trunk/engines/scumm/proc3ARM.s	2009-01-24 18:27:09 UTC (rev 36038)
+++ scummvm/trunk/engines/scumm/proc3ARM.s	2009-01-24 19:19:24 UTC (rev 36039)
@@ -198,7 +198,8 @@
 	@ 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.