Skip to content

Fix memory allocation bug in JPVerb #416

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

Merged
capital-G merged 4 commits into from
Jan 29, 2026
Merged

Fix memory allocation bug in JPVerb #416

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3440f84
fix allocation of faust class
capital-G Jan 28, 2026
aa61075
fix memory leaks in JPVerb
capital-G Jan 28, 2026
d5c4c23
replace goto end with ClearUnitIfMemFailed
capital-G Jan 29, 2026
20b59e2
remove setting default calc function
capital-G Jan 29, 2026
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
32 changes: 13 additions & 19 deletions source/DEINDUGens/JPverbRaw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,12 +1526,16 @@ void Faust_next_clear(Faust* unit, int inNumSamples)

void Faust_Ctor(Faust* unit) // module constructor
{
// init such that we can still free them in the destructor if
// allocation fails.
unit->mDSP = nullptr;
unit->mInBufCopy = nullptr;
unit->mInBufValue = nullptr;

// allocate dsp
unit->mDSP = new(RTAlloc(unit->mWorld, sizeof(FAUSTCLASS))) FAUSTCLASS();
if (!unit->mDSP) {
Print("Faust[%s]: RT memory allocation failed, try increasing the real-time memory size in the server options\n", g_unitName);
goto end;
}
void* mem = RTAlloc(unit->mWorld, sizeof(FAUSTCLASS));
ClearUnitIfMemFailed(mem);
unit->mDSP = new (mem) FAUSTCLASS();
{
// init dsp
unit->mDSP->instanceInit((int)SAMPLERATE);
Expand Down Expand Up @@ -1561,24 +1565,15 @@ void Faust_Ctor(Faust* unit) // module constructor
SETCALC(Faust_next);
} else {
unit->mInBufCopy = (float**)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*sizeof(float*));
if (!unit->mInBufCopy) {
Print("Faust[%s]: RT memory allocation failed, try increasing the real-time memory size in the server options\n", g_unitName);
goto end;
}
ClearUnitIfMemFailed(unit->mInBufCopy);
// Allocate memory for input buffer copies (numInputs * bufLength)
// and linear interpolation state (numInputs)
// = numInputs * (bufLength + 1)
unit->mInBufValue = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*sizeof(float));
if (!unit->mInBufValue) {
Print("Faust[%s]: RT memory allocation failed, try increasing the real-time memory size in the server options\n", g_unitName);
goto end;
}
ClearUnitIfMemFailed(unit->mInBufValue);
// Aquire memory for interpolator state.
float* mem = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*BUFLENGTH*sizeof(float));
if (mem) {
Print("Faust[%s]: RT memory allocation failed, try increasing the real-time memory size in the server options\n", g_unitName);
goto end;
}
auto* mem = (float*)RTAlloc(unit->mWorld, unit->getNumAudioInputs()*BUFLENGTH*sizeof(float));
ClearUnitIfMemFailed(mem);
for (int i = 0; i < unit->getNumAudioInputs(); ++i) {
// Initialize interpolator.
unit->mInBufValue[i] = IN0(i);
Expand Down Expand Up @@ -1608,7 +1603,6 @@ void Faust_Ctor(Faust* unit) // module constructor
}
}

end:
// Fix for https://github.com/grame-cncm/faust/issues/13
ClearUnitOutputs(unit, 1);
}
Expand Down