zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-22 20:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure that sample_data memory is unlocked even if sample_data_24 mlock fails

Browse source
This commit is contained in:
Marcus Weseloh 2018-04-04 11:03:47 +02:00
parent d5407742a6
commit 29296b0e20
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/sfloader/fluid_samplecache.c
View file

@ -93,15 +93,22 @@ int fluid_samplecache_load(SFData *sf,
{
/* Lock the memory to disable paging. It's okay if this fails. It
* probably means that the user doesn't have the required permission. */
entry->mlocked = (fluid_mlock(entry->sample_data, entry->sample_count * 2) == 0);
if (entry->sample_data24 != NULL)
if (fluid_mlock(entry->sample_data, entry->sample_count * 2) == 0)
{
entry->mlocked &= (fluid_mlock(entry->sample_data24, entry->sample_count) == 0);
}
if (entry->sample_data24 != NULL)
{
entry->mlocked = (fluid_mlock(entry->sample_data24, entry->sample_count) == 0);
}
else
{
entry->mlocked = TRUE;
}
if (!entry->mlocked)
{
FLUID_LOG(FLUID_WARN, "Failed to pin the sample data to RAM; swapping is possible.");
if (!entry->mlocked)
{
fluid_munlock(entry->sample_data, entry->sample_count * 2);
FLUID_LOG(FLUID_WARN, "Failed to pin the sample data to RAM; swapping is possible.");
}
}
}
@ -137,7 +144,10 @@ int fluid_samplecache_unload(const short *sample_data)
if (entry->mlocked)
{
fluid_munlock(entry->sample_data, entry->sample_count * 2);
fluid_munlock(entry->sample_data24, entry->sample_count);
if (entry->sample_data24 != NULL)
{
fluid_munlock(entry->sample_data24, entry->sample_count);
}
}
fluid_list_remove(samplecache_list, entry);