aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-05-26 14:00:52 +0000
committerTorbjörn Andersson2006-05-26 14:00:52 +0000
commit15411f5fface864b40ad8f4aadfec059b2632a1d (patch)
tree13d0f81003d8bcf0c601531644ac29402c54c44d /engines
parenta11eddeb0b800f3fc937522d73ac22c8fc119dbe (diff)
downloadscummvm-rg350-15411f5fface864b40ad8f4aadfec059b2632a1d.tar.gz
scummvm-rg350-15411f5fface864b40ad8f4aadfec059b2632a1d.tar.bz2
scummvm-rg350-15411f5fface864b40ad8f4aadfec059b2632a1d.zip
If a game ends by natural causes, unload_object() will be called twice. Make
sure it doesn't try to free the same memory twice. svn-id: r22659
Diffstat (limited to 'engines')
-rw-r--r--engines/agi/objects.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp
index 520aafd9e1..9c908c29e2 100644
--- a/engines/agi/objects.cpp
+++ b/engines/agi/objects.cpp
@@ -127,9 +127,12 @@ void unload_objects() {
unsigned int i;
if (objects != NULL) {
- for (i = 0; i < game.num_objects; i++)
+ for (i = 0; i < game.num_objects; i++) {
free(objects[i].name);
+ objects[i].name = NULL;
+ }
free(objects);
+ objects = NULL;
}
}