Skip to content

Fix and work around UBSan errors #110

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

Open
kavika13 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix and work around UBSan errors #110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
268c9c3
Work around UBSan error "left shift of negative value -1"
kavika13 Mar 23, 2025
0855574
Fix UBSan error calling several functions when tsf->voices is null
kavika13 Mar 23, 2025
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
28 changes: 14 additions & 14 deletions tsf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ static void tsf_region_operator(struct tsf_region* region, tsf_u16 genOper, unio
case GEN_FLOAT: (( float*)region)[offset] = amount->shortAmount; return;
case GEN_INT: (( int*)region)[offset] = amount->shortAmount; return;
case GEN_UINT_ADD: ((unsigned int*)region)[offset] += amount->shortAmount; return;
case GEN_UINT_ADD15: ((unsigned int*)region)[offset] += amount->shortAmount<<15; return;
case GEN_UINT_ADD15: ((unsigned int*)region)[offset] += amount->shortAmount * 32768; return;
case GEN_KEYRANGE: region->lokey = amount->range.lo; region->hikey = amount->range.hi; return;
case GEN_VELRANGE: region->lovel = amount->range.lo; region->hivel = amount->range.hi; return;
case GEN_LOOPMODE: region->loop_mode = ((amount->wordAmount&3) == 3 ? TSF_LOOPMODE_SUSTAIN : ((amount->wordAmount&3) == 1 ? TSF_LOOPMODE_CONTINUOUS : TSF_LOOPMODE_NONE)); return;
Expand Down Expand Up @@ -1490,7 +1490,7 @@ TSFDEF void tsf_close(tsf* f)

TSFDEF void tsf_reset(tsf* f)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++)
if (v->playingPreset != -1 && (v->ampenv.segment < TSF_SEGMENT_RELEASE || v->ampenv.parameters.release))
tsf_voice_endquick(f, v);
Expand Down Expand Up @@ -1563,7 +1563,7 @@ TSFDEF int tsf_note_on(tsf* f, int preset_index, int key, float vel)
struct tsf_voice *voice, *v, *vEnd; TSF_BOOL doLoop; float lowpassFilterQDB, lowpassFc;
if (key < region->lokey || key > region->hikey || midiVelocity < region->lovel || midiVelocity > region->hivel) continue;

voice = TSF_NULL, v = f->voices, vEnd = v + f->voiceNum;
voice = TSF_NULL, v = f->voices, vEnd = v ? v + f->voiceNum : TSF_NULL;
if (region->group)
{
for (; v != vEnd; v++)
Expand Down Expand Up @@ -1663,7 +1663,7 @@ TSFDEF int tsf_bank_note_on(tsf* f, int bank, int preset_number, int key, float

TSFDEF void tsf_note_off(tsf* f, int preset_index, int key)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum, *vMatchFirst = TSF_NULL, *vMatchLast = TSF_NULL;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL, *vMatchFirst = TSF_NULL, *vMatchLast = TSF_NULL;
for (; v != vEnd; v++)
{
//Find the first and last entry in the voices list with matching preset, key and look up the smallest play index
Expand Down Expand Up @@ -1691,15 +1691,15 @@ TSFDEF int tsf_bank_note_off(tsf* f, int bank, int preset_number, int key)

TSFDEF void tsf_note_off_all(tsf* f)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++) if (v->playingPreset != -1 && v->ampenv.segment < TSF_SEGMENT_RELEASE)
tsf_voice_end(f, v);
}

TSFDEF int tsf_active_voice_count(tsf* f)
{
int count = 0;
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++) if (v->playingPreset != -1) count++;
return count;
}
Expand Down Expand Up @@ -1734,7 +1734,7 @@ TSFDEF void tsf_render_short(tsf* f, short* buffer, int samples, int flag_mixing

TSFDEF void tsf_render_float(tsf* f, float* buffer, int samples, int flag_mixing)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
if (!flag_mixing) TSF_MEMSET(buffer, 0, (f->outputmode == TSF_MONO ? 1 : 2) * sizeof(float) * samples);
for (; v != vEnd; v++)
if (v->playingPreset != -1)
Expand Down Expand Up @@ -1793,7 +1793,7 @@ static void tsf_channel_applypitch(tsf* f, int channel, struct tsf_channel* c)
{
struct tsf_voice *v, *vEnd;
float pitchShift = (c->pitchWheel == 8192 ? c->tuning : ((c->pitchWheel / 16383.0f * c->pitchRange * 2.0f) - c->pitchRange + c->tuning));
for (v = f->voices, vEnd = v + f->voiceNum; v != vEnd; v++)
for (v = f->voices, vEnd = v ? v + f->voiceNum : TSF_NULL; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel)
tsf_voice_calcpitchratio(v, pitchShift, f->outSampleRate);
}
Expand Down Expand Up @@ -1853,7 +1853,7 @@ TSFDEF int tsf_channel_set_pan(tsf* f, int channel, float pan)
struct tsf_voice *v, *vEnd;
struct tsf_channel *c = tsf_channel_init(f, channel);
if (!c) return 0;
for (v = f->voices, vEnd = v + f->voiceNum; v != vEnd; v++)
for (v = f->voices, vEnd = v ? v + f->voiceNum : TSF_NULL; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel)
{
float newpan = v->region->pan + pan - 0.5f;
Expand All @@ -1872,7 +1872,7 @@ TSFDEF int tsf_channel_set_volume(tsf* f, int channel, float volume)
struct tsf_channel *c = tsf_channel_init(f, channel);
if (!c) return 0;
if (gainDB == c->gainDB) return 1;
for (v = f->voices, vEnd = v + f->voiceNum, gainDBChange = gainDB - c->gainDB; v != vEnd; v++)
for (v = f->voices, vEnd = v ? v + f->voiceNum : TSF_NULL, gainDBChange = gainDB - c->gainDB; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel)
v->noteGainDB += gainDBChange;
c->gainDB = gainDB;
Expand Down Expand Up @@ -1918,7 +1918,7 @@ TSFDEF int tsf_channel_set_sustain(tsf* f, int channel, int flag_sustain)
//Turning on sustain does no action now, just starts note_off behaving differently
if (flag_sustain) return 1;
//Turning off sustain, actually end voices that got a note_off and were set to heldSustain status
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel && v->ampenv.segment < TSF_SEGMENT_RELEASE && v->heldSustain)
tsf_voice_end(f, v);
Expand All @@ -1940,7 +1940,7 @@ TSFDEF int tsf_channel_note_on(tsf* f, int channel, int key, float vel)
TSFDEF void tsf_channel_note_off(tsf* f, int channel, int key)
{
unsigned sustain;
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum, *vMatchFirst = TSF_NULL, *vMatchLast = TSF_NULL;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL, *vMatchFirst = TSF_NULL, *vMatchLast = TSF_NULL;
for (; v != vEnd; v++)
{
//Find the first and last entry in the voices list with matching channel, key and look up the smallest play index
Expand All @@ -1965,15 +1965,15 @@ TSFDEF void tsf_channel_note_off(tsf* f, int channel, int key)
TSFDEF void tsf_channel_note_off_all(tsf* f, int channel)
{
//Ignore sustain channel settings, note_off_all overrides
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel && v->ampenv.segment < TSF_SEGMENT_RELEASE)
tsf_voice_end(f, v);
}

TSFDEF void tsf_channel_sounds_off_all(tsf* f, int channel)
{
struct tsf_voice *v = f->voices, *vEnd = v + f->voiceNum;
struct tsf_voice *v = f->voices, *vEnd = v ? v + f->voiceNum : TSF_NULL;
for (; v != vEnd; v++)
if (v->playingPreset != -1 && v->playingChannel == channel && (v->ampenv.segment < TSF_SEGMENT_RELEASE || v->ampenv.parameters.release))
tsf_voice_endquick(f, v);
Expand Down