Merge pull request #13740 from acolombier/fix/sampler-clone-crash

fix: prevent null CO access when cloning sampler or preview
mixxxdj · Oct 10, 2024 · 34dde6f · 34dde6f
2 parents f4ace49 + be86cbb
commit 34dde6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/engine/channels/enginechannel.h b/src/engine/channels/enginechannel.h
@@ -53,7 +53,7 @@ class EngineChannel : public EngineObject {
  void setTalkover(bool enabled);
  virtual bool isTalkoverEnabled() const;
  inline bool isTalkoverChannel() { return m_bIsTalkoverChannel; };
- inline bool isPrimaryDeck() {
+ inline bool isPrimaryDeck() const {
  return m_bIsPrimaryDeck;
  };
  int getChannelIndex() {

diff --git a/src/engine/channels/enginedeck.cpp b/src/engine/channels/enginedeck.cpp
@@ -10,6 +10,7 @@
 #include "engine/enginevumeter.h"
 #include "moc_enginedeck.cpp"
 #include "track/track.h"
+#include "util/assert.h"
 #include "util/sample.h"
 
 #ifdef __STEM__
@@ -208,6 +209,16 @@ void EngineDeck::cloneStemState(const EngineDeck* deckToClone) {
  VERIFY_OR_DEBUG_ASSERT(deckToClone) {
  return;
  }
+ // Sampler and preview decks don't have stem controls
+ if (!isPrimaryDeck() || !deckToClone->isPrimaryDeck()) {
+ return;
+ }
+ VERIFY_OR_DEBUG_ASSERT(m_stemGain.size() == kMaxSupportedStems &&
+ m_stemMute.size() == kMaxSupportedStems &&
+ deckToClone->m_stemGain.size() == kMaxSupportedStems &&
+ deckToClone->m_stemMute.size() == kMaxSupportedStems) {
+ return;
+ }
  for (int stemIdx = 0; stemIdx < kMaxSupportedStems; stemIdx++) {
  m_stemGain[stemIdx]->set(deckToClone->m_stemGain[stemIdx]->get());
  m_stemMute[stemIdx]->set(deckToClone->m_stemMute[stemIdx]->get());