mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Separate musicReadBlob into mmmmmm_blob and pppppp_blob

Browse source 
musicReadBlob was used for both MMMMMM and PPPPPP soundtracks. This
causes a memory leak if you have mmmmmm.vvv installed, because the
pointers holding each allocated block of MMMMMM would be lost when
PPPPPP got loaded. Valgrind complains about this memory leak.

This is in contrast to 2.2 and previous behavior, where musicReadBlob
was only a temporary object instead of being held in musicclass.
However, this wasn't really a memory leak (moreso something that just
didn't get cleaned up when closing the game), but it did get turned into
a leak when per-level assets mounting and unmounting got introduced in
2.3 (loading a level with custom assets after starting the game with an
mmmmmm.vvv, or exiting out of a level that had an mmmmmm.vvv, would
cause the game to leak memory). Leo recognized this, and moved
musicReadBlob onto musicclass in a separate 2.3 PR, but either he didn't
think about what was happening here too closely, or he didn't use
Valgrind, because he forgot about the memory leak caused by re-using the
same binaryBlob for PPPPPP and MMMMMM.

So instead, just use two different binaryBlob objects for MMMMMM and
PPPPPP. That way, no memory leaks happen.
This commit is contained in:
Misa 2021-02-15 16:42:58 -08:00 committed by Ethan Lee
parent f39174b3e3
commit 77748f29f9
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
desktop_version/src/Music.cpp
View file

@ -74,11 +74,11 @@ void musicclass::init()
num_mmmmmm_tracks = 0; num_mmmmmm_tracks = 0;
num_pppppp_tracks = 0; num_pppppp_tracks = 0;
if (!musicReadBlob.unPackBinary("mmmmmm.vvv")) if (!mmmmmm_blob.unPackBinary("mmmmmm.vvv"))
{ {
mmmmmm = false; mmmmmm = false;
usingmmmmmm=false; usingmmmmmm=false;
bool ohCrap = musicReadBlob.unPackBinary("vvvvvvmusic.vvv"); bool ohCrap = pppppp_blob.unPackBinary("vvvvvvmusic.vvv");
SDL_assert(ohCrap && "Music not found!"); SDL_assert(ohCrap && "Music not found!");
} }
else else
@ -102,38 +102,38 @@ void musicclass::init()
} \ } \
} }
TRACK_NAMES(musicReadBlob) TRACK_NAMES(mmmmmm_blob)
num_mmmmmm_tracks += musicTracks.size(); num_mmmmmm_tracks += musicTracks.size();
const std::vector<int> extra = musicReadBlob.getExtra(); const std::vector<int> extra = mmmmmm_blob.getExtra();
for (size_t i = 0; i < extra.size(); i++) for (size_t i = 0; i < extra.size(); i++)
{ {
const int& index_ = extra[i]; const int& index_ = extra[i];
rw = SDL_RWFromMem(musicReadBlob.getAddress(index_), musicReadBlob.getSize(index_)); rw = SDL_RWFromMem(mmmmmm_blob.getAddress(index_), mmmmmm_blob.getSize(index_));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_mmmmmm_tracks++; num_mmmmmm_tracks++;
} }
bool ohCrap = musicReadBlob.unPackBinary("vvvvvvmusic.vvv"); bool ohCrap = pppppp_blob.unPackBinary("vvvvvvmusic.vvv");
SDL_assert(ohCrap && "Music not found!"); SDL_assert(ohCrap && "Music not found!");
} }
int index; int index;
SDL_RWops *rw; SDL_RWops *rw;
TRACK_NAMES(musicReadBlob) TRACK_NAMES(pppppp_blob)
#undef FOREACH_TRACK #undef FOREACH_TRACK
num_pppppp_tracks += musicTracks.size() - num_mmmmmm_tracks; num_pppppp_tracks += musicTracks.size() - num_mmmmmm_tracks;
const std::vector<int> extra = musicReadBlob.getExtra(); const std::vector<int> extra = pppppp_blob.getExtra();
for (size_t i = 0; i < extra.size(); i++) for (size_t i = 0; i < extra.size(); i++)
{ {
const int& index_ = extra[i]; const int& index_ = extra[i];
rw = SDL_RWFromMem(musicReadBlob.getAddress(index_), musicReadBlob.getSize(index_)); rw = SDL_RWFromMem(pppppp_blob.getAddress(index_), pppppp_blob.getSize(index_));
musicTracks.push_back(MusicTrack( rw )); musicTracks.push_back(MusicTrack( rw ));
num_pppppp_tracks++; num_pppppp_tracks++;
@ -165,7 +165,8 @@ void musicclass::destroy()
} }
musicTracks.clear(); musicTracks.clear();
musicReadBlob.clear(); pppppp_blob.clear();
mmmmmm_blob.clear();
} }
void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fadein_ms /*= 3000*/) void musicclass::play(int t, const double position_sec /*= 0.0*/, const int fadein_ms /*= 3000*/)

3
desktop_version/src/Music.h
View file

@ -51,7 +51,8 @@ public:
bool mmmmmm; bool mmmmmm;
bool usingmmmmmm; bool usingmmmmmm;
binaryBlob musicReadBlob; binaryBlob pppppp_blob;
binaryBlob mmmmmm_blob;
int num_pppppp_tracks; int num_pppppp_tracks;
int num_mmmmmm_tracks; int num_mmmmmm_tracks;