Ticket #8521: saga_mem_leaks.diff

saga/music.cpp

@@ -305 +305 @@
         _songTable = 0;
 
         _track = NULL;
+        
+        _midiMusicData = NULL;
+        _midiMusicSize = 0;
 }
 
 Music::~Music() {
@@ -316 +319 @@
         delete smfParser;
 
         free(_songTable);
+        free(_midiMusicData);
 }
 
 void Music::musicVolumeGaugeCallback(void *refCon) {
@@ -371 +375 @@
         AudioStream *audioStream = NULL;
         MidiParser *parser;
         ResourceContext *context;
-        byte *resourceData;
-        size_t resourceSize;
 
         debug(2, "Music::play %d, %d", resourceId, flags);
 
@@ -432 +434 @@
                 flags = MUSIC_NORMAL;
         }
 
-        // FIXME: Is resource_data ever freed?
         // Load MIDI/XMI resource data
 
         if (_vm->getGameType() == GType_ITE) {
@@ -473 +474 @@
 
         _player->setGM(true);
 
-        _vm->_resource->loadResource(context, resourceId, resourceData, resourceSize);
-
-        if (resourceSize < 4) {
+        if (_midiMusicData) {
+                free(_midiMusicData);
+        }
+        _vm->_resource->loadResource(context, resourceId, _midiMusicData, _midiMusicSize);
+        if (_midiMusicSize < 4) {
                 error("Music::play() wrong music resource size");
         }
 
-        if (xmidiParser->loadMusic(resourceData, resourceSize)) {
+        if (xmidiParser->loadMusic(_midiMusicData, _midiMusicSize)) {
                 if (_vm->getGameType() == GType_ITE)
                         _player->setGM(false);
 
                 parser = xmidiParser;
         } else {
-                if (smfParser->loadMusic(resourceData, resourceSize)) {
+                if (smfParser->loadMusic(_midiMusicData, _midiMusicSize)) {
                         parser = smfParser;
                 } else {
                         error("Music::play() wrong music resource");

saga/music.h

@@ -92 +92 @@
 
         byte *_musicData;
         uint16 *_buf;
-        uint32 _musicDataSize;
+        size_t _musicDataSize;
 };
 
 class Music {
@@ -137 +137 @@
         MidiParser *xmidiParser;
         MidiParser *smfParser;
 
+        byte *_midiMusicData;
+        size_t _midiMusicSize;
+
         DigitalTrackInfo *_track;
 
         static void musicVolumeGaugeCallback(void *refCon);

saga/rscfile.cpp

@@ -313 +313 @@
                         subjectResourceData->offset = resourceData->offset;
                         subjectResourceData->size = resourceData->size;
                 }
-
+                free(tableBuffer);
         }
 
         //process external patch files
@@ -547 +547 @@
         }
 
         _vm->_anim->loadCutawayList(resourcePointer, resourceLength);
+        free(resourcePointer);
 
         _vm->_resource->loadResource(resourceContext, _metaResource.songTableID, resourcePointer, resourceLength);