[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.515,2.516 saveload.cpp,1.232,1.233 script_v6.cpp,1.450,1.451 script_v72he.cpp,2.303,2.304 vars.cpp,1.142,1.143
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_124.png,NONE,1.1 big_scummvm_125.png,NONE,1.1 scummvm_124.jpg,NONE,1.1 scummvm_124.txt,NONE,1.1 scummvm_125.jpg,NONE,1.1 scummvm_125.txt,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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");
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.515,2.516 saveload.cpp,1.232,1.233 script_v6.cpp,1.450,1.451 script_v72he.cpp,2.303,2.304 vars.cpp,1.142,1.143
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_124.png,NONE,1.1 big_scummvm_125.png,NONE,1.1 scummvm_124.jpg,NONE,1.1 scummvm_124.txt,NONE,1.1 scummvm_125.jpg,NONE,1.1 scummvm_125.txt,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list