otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Out of bounds checking and crash fix

Browse source
This commit is contained in:
LeviathaninWaves 2023-12-01 19:13:44 -06:00
parent 4bd0dc2c63
commit c634f20d05
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/sampleEdit.cpp
View file

@ -1235,9 +1235,12 @@ void FurnaceGUI::drawSampleEdit() {
ImGui::OpenPopup("SXFadeOpt"); ImGui::OpenPopup("SXFadeOpt");
} }
if (ImGui::BeginPopupContextItem("SXFadeÓpt",ImGuiPopupFlags_MouseButtonLeft)) { if (ImGui::BeginPopupContextItem("SXFadeÓpt",ImGuiPopupFlags_MouseButtonLeft)) {
if (sampleXFadeLoopLength>sample->loopStart) sampleXFadeLoopLength=sample->loopStart;
if (sampleXFadeLoopLength>(sample->loopEnd-sample->loopStart)) sampleXFadeLoopLength=sample->loopEnd-sample->loopStart;
if (ImGui::SliderInt("Number of samples", &sampleXFadeLoopLength, 0, 100000)) { if (ImGui::SliderInt("Number of samples", &sampleXFadeLoopLength, 0, 100000)) {
if (sampleXFadeLoopLength<0) sampleXFadeLoopLength=0; if (sampleXFadeLoopLength<0) sampleXFadeLoopLength=0;
if (sampleXFadeLoopLength>sample->loopStart) sampleXFadeLoopLength=sample->loopStart; if (sampleXFadeLoopLength>sample->loopStart) sampleXFadeLoopLength=sample->loopStart;
if (sampleXFadeLoopLength>(sample->loopEnd-sample->loopStart)) sampleXFadeLoopLength=sample->loopEnd-sample->loopStart;
if (sampleXFadeLoopLength>100000) sampleXFadeLoopLength=100000; if (sampleXFadeLoopLength>100000) sampleXFadeLoopLength=100000;
} }
if (ImGui::SliderInt("Linear <-> Equal power", &sampleXFadeLoopLaw, 0, 100000)) { if (ImGui::SliderInt("Linear <-> Equal power", &sampleXFadeLoopLaw, 0, 100000)) {
@ -1245,6 +1248,14 @@ void FurnaceGUI::drawSampleEdit() {
if (sampleXFadeLoopLaw>100000) sampleXFadeLoopLaw=100000; if (sampleXFadeLoopLaw>100000) sampleXFadeLoopLaw=100000;
} }
if (ImGui::Button("Apply")) { if (ImGui::Button("Apply")) {
if (sampleXFadeLoopLength>sample->loopStart){
SAMPLE_WARN(warnLoop,"Crossfade: length would go out of bounds. Aborted...");
goto done;
}
if (sampleXFadeLoopLength>(sample->loopEnd-sample->loopStart)) {
SAMPLE_WARN(warnLoop,"Crossfade: length would overflow loopStart. Try a smaller random value.");
goto done;
}
sample->prepareUndo(true); sample->prepareUndo(true);
e->lockEngine([this,sample]{ e->lockEngine([this,sample]{
SAMPLE_OP_BEGIN; SAMPLE_OP_BEGIN;
@ -1278,6 +1289,7 @@ void FurnaceGUI::drawSampleEdit() {
e->renderSamples(curSample); e->renderSamples(curSample);
}); });
MARK_MODIFIED; MARK_MODIFIED;
done:
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
} }
ImGui::EndPopup(); ImGui::EndPopup();