[Scummvm-cvs-logs] SF.net SVN: scummvm: [23845] scummvm/trunk/engines/sword1/control.cpp

chrilith at users.sourceforge.net chrilith at users.sourceforge.net
Sat Sep 9 15:57:24 CEST 2006


Revision: 23845
          http://svn.sourceforge.net/scummvm/?rev=23845&view=rev
Author:   chrilith
Date:     2006-09-09 06:57:20 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Fixed unaligned read (this fix a potential crash clicking on the Text option button)

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/control.cpp

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2006-09-09 13:07:15 UTC (rev 23844)
+++ scummvm/trunk/engines/sword1/control.cpp	2006-09-09 13:57:20 UTC (rev 23845)
@@ -140,12 +140,12 @@
 	FrameHeader *fHead = _resMan->fetchFrame(_resMan->fetchRes(_resId), _frameIdx);
 	uint8 *src = (uint8*)fHead + sizeof(FrameHeader);
 	uint8 *dst = _dstBuf;
-	for (uint16 cnt = 0; cnt < FROM_LE_16(fHead->height); cnt++) {
-		for (uint16 cntx = 0; cntx < FROM_LE_16(fHead->width); cntx++)
+	for (uint16 cnt = 0; cnt < READ_LE_UINT16(&fHead->height); cnt++) {
+		for (uint16 cntx = 0; cntx < READ_LE_UINT16(&fHead->width); cntx++)
 			if (src[cntx])
 				dst[cntx] = src[cntx];
 		dst += SCREEN_WIDTH;
-		src += FROM_LE_16(fHead->width);
+		src += READ_LE_UINT16(&fHead->width);
 	}
 	_system->copyRectToScreen(_dstBuf, SCREEN_WIDTH, _x, _y, _width, _height);
 }


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




More information about the Scummvm-git-logs mailing list