1.7B: Fixes for buffer overread on scale selection

Chysn · Jan 18, 2019 · 89e85b0 · 89e85b0
1 parent d1ae0d3
commit 89e85b0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/software/o_c_REV/HEM_ASR.ino b/software/o_c_REV/HEM_ASR.ino
@@ -73,7 +73,7 @@ public:
         }
         if (cursor == 1) { // Scale selection
             scale += direction;
-            if (scale == OC::Scales::NUM_SCALES) scale = 0;
+            if (scale >= OC::Scales::NUM_SCALES) scale = 0;
             if (scale < 0) scale = OC::Scales::NUM_SCALES - 1;
             quantizer.Configure(OC::Scales::GetScale(scale), 0xffff);
         }

diff --git a/software/o_c_REV/HEM_DualQuant.ino b/software/o_c_REV/HEM_DualQuant.ino
@@ -75,8 +75,8 @@ public:
         if (cursor == 0 || cursor == 2) {
             // Scale selection
             scale[ch] += direction;
-            if (scale[ch] == OC::Scales::NUM_SCALES) scale[ch] = 0;
-            if (scale[ch] < 0) scale[cursor] = OC::Scales::NUM_SCALES - 1;
+            if (scale[ch] >= OC::Scales::NUM_SCALES) scale[ch] = 0;
+            if (scale[ch] < 0) scale[ch] = OC::Scales::NUM_SCALES - 1;
             quantizer[ch].Configure(OC::Scales::GetScale(scale[ch]), 0xffff);
             continuous[ch] = 1; // Re-enable continuous mode when scale is changed
         } else {

diff --git a/software/o_c_REV/HEM_Squanch.ino b/software/o_c_REV/HEM_Squanch.ino
@@ -72,7 +72,7 @@ public:
     void OnEncoderMove(int direction) {
         if (cursor == 2) { // Scale selection
             scale += direction;
-            if (scale == OC::Scales::NUM_SCALES) scale = 0;
+            if (scale >= OC::Scales::NUM_SCALES) scale = 0;
             if (scale < 0) scale = OC::Scales::NUM_SCALES - 1;
             quantizer.Configure(OC::Scales::GetScale(scale), 0xffff);
             continuous = 1; // Re-enable continuous mode when scale is changed

diff --git a/software/o_c_REV/OC_version.h b/software/o_c_REV/OC_version.h
@@ -3,5 +3,5 @@
 //
 // GENERATED FILE, DO NOT EDIT
 //
-#define OC_VERSION "v1.8RC"
+#define OC_VERSION "v1.7B"
 #endif