Skip to content

Fix rpmalloc assert for NotePlayHandle #6549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Veratil wants to merge 1 commit into from
Closed

Fix rpmalloc assert for NotePlayHandle #6549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/NotePlayHandle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ class NotePlayHandleManager
static void release( NotePlayHandle * nph );
static void extend( int i );
static void free();
static void freeAvailable();

private:
static NotePlayHandle ** s_available;
Expand Down
12 changes: 10 additions & 2 deletions src/core/NotePlayHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ void NotePlayHandleManager::extend( int c )
{
s_size += c;
auto tmp = MM_ALLOC<NotePlayHandle*>(s_size);
MM_FREE( s_available );
freeAvailable();
s_available = tmp;

auto n = MM_ALLOC<NotePlayHandle>(c);
Expand All @@ -662,10 +662,18 @@ void NotePlayHandleManager::extend( int c )
}
}

void NotePlayHandleManager::free()
void NotePlayHandleManager::freeAvailable()
{
// rpmalloc catches this as a non-free'd alloc
NotePlayHandle * n = s_available[0];
MM_FREE(n);
MM_FREE(s_available);
}

void NotePlayHandleManager::free()
{
freeAvailable();
}


} // namespace lmms