Merge pull request #59 from treapster/main

Fix UBSan errors
Geonkick-Synthesizer · Feb 17, 2024 · 08d017e · 08d017e
2 parents 1d20f00 + 45a01cc
commit 08d017e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,10 +41,10 @@ endif ()
 
 if (GKICK_ARCHITECTURE MATCHES x86_64)
   message(STATUS "set optimisation compiler flags for ${GKICK_ARCHITECTURE}")
-  set(GKICK_OPTIMISATION_FLAGS "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer")
+  set(GKICK_OPTIMISATION_FLAGS "-O3 -msse -msse2 -mfpmath=sse -funsafe-math-optimizations -fno-math-errno -fno-trapping-math -fomit-frame-pointer")
 else ()
   message(STATUS "set optimisation compiler flags for ${GKICK_ARCHITECTURE}")
-  set(GKICK_OPTIMISATION_FLAGS "-O3 -ffast-math -fomit-frame-pointer")
+  set(GKICK_OPTIMISATION_FLAGS "-O3 -funsafe-math-optimizations -fno-math-errno -fno-trapping-math -fomit-frame-pointer")
 endif ()
 
 set(CMAKE_CXX_STANDARD 17)

diff --git a/src/compressor_group_box.cpp b/src/compressor_group_box.cpp
@@ -156,7 +156,8 @@ void CompressorGroupBox::updateGui()
         compressorCheckbox->setPressed(geonkickApi->isCompressorEnabled());
 
         // Attack
-        attackSlider->onSetValue(100 * (log10(1000 * geonkickApi->getCompressorAttack()) / log10(2000)));
+        double attack = 100 * (log10(1000 * geonkickApi->getCompressorAttack()) / log10(2000));
+        attackSlider->onSetValue(static_cast<int>(std::max(attack, 0.0)));
 
         // Threshold
         auto threshold = geonkickApi->getCompressorThreshold();

diff --git a/src/dsp/src/geonkick.h b/src/dsp/src/geonkick.h
@@ -39,6 +39,10 @@ extern "C" {
 #include <float.h>
 #include <stdbool.h>
 
+#ifdef __FAST_MATH__
+#error -ffast-math disables nan detection needed by geonkick
+#endif
+
 #ifdef __STDC_NO_ATOMICS__
 #error atomic operations are not supported
 #endif

diff --git a/src/dsp/src/mixer.c b/src/dsp/src/mixer.c
@@ -109,8 +109,8 @@ gkick_mixer_process(struct gkick_mixer *mixer,
                                                           out[right_index] + offset,
                                                           size,
                                                           limiter_val);
-                                gkick_real leveler_val = ring_buffer_get_cur_data(output->ring_buffer);
-                                leveler_val *= limiter_val;
+                                gkick_real sample = ring_buffer_get_cur_data(output->ring_buffer);
+                                gkick_real leveler_val = fabsf(sample) * limiter_val;
                                 gkick_mixer_set_leveler(mixer, i, leveler_val);
                         }
                         ring_buffer_next(output->ring_buffer, size);

diff --git a/src/dsp/src/synthesizer.c b/src/dsp/src/synthesizer.c
@@ -1088,9 +1088,14 @@ synth_kick_env_get_apply_type(struct gkick_synth *synth,
 			      enum gkick_envelope_apply_type *apply_type)
 {
 	gkick_synth_lock(synth);
-        if (env_type == GEONKICK_FILTER_CUTOFF_ENVELOPE) {
+        switch (env_type) {
+        case GEONKICK_FILTER_CUTOFF_ENVELOPE:
 		*apply_type = gkick_envelope_get_apply_type(synth->filter->cutoff_env);
-	}
+                break;
+        default:
+                *apply_type = GEONKICK_ENVELOPE_APPLY_LINEAR;
+                break;
+        }
         gkick_synth_unlock(synth);
         return GEONKICK_OK;	
 }

diff --git a/src/kit_model.cpp b/src/kit_model.cpp
@@ -163,7 +163,8 @@ int KitModel::percussionLimiter(PercussionIndex index) const
 int KitModel::percussionLeveler(PercussionIndex index) const
 {
         auto realVal = geonkickApi->getLimiterLevelerValue(percussionId(index));
-        double logVal = 20 * log10(realVal);
+        // add small delta to avoid -inf for zero value
+        double logVal = 20 * log10(realVal + 0.000000001);
         int val = (logVal + 55.0) * 100.0 / 75;
         if (val < 0)
                 val = 0;