[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.179,1.180

Chris Apers chrilith at users.sourceforge.net
Fri Sep 2 04:49:08 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25494

Modified Files:
	actor.cpp 
Log Message:
Fixed potential memory error on system that can't return a pointer of 0 byte

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- actor.cpp	30 Aug 2005 12:13:09 -0000	1.179
+++ actor.cpp	2 Sep 2005 11:47:47 -0000	1.180
@@ -318,7 +318,7 @@
 		debug(9, "Frame resource contains %d frames (res length is %d)", framesCount, resourceLength);
 
 		framesPointer = (ActorFrameSequence *)malloc(sizeof(ActorFrameSequence) * framesCount);
-		if (framesPointer == NULL) {
+		if (framesPointer == NULL && framesCount != 0) {
 			memoryError("Actor::loadActorResources");
 		}
 





More information about the Scummvm-git-logs mailing list