[SCM] hydrogen/master: Add patch cherry-picked upstream to fix crash enabling rubberband with new empty instrument component.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Sep 18 21:18:04 UTC 2017


The following commit has been merged in the master branch:
commit 91aaa2eae1314248ecf00f770ff28c39907a8f27
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 18 22:15:35 2017 +0200

    Add patch cherry-picked upstream to fix crash enabling rubberband with new empty instrument component.

diff --git a/debian/patches/020170916~27d664c.patch b/debian/patches/020170916~27d664c.patch
new file mode 100644
index 0000000..149be3d
--- /dev/null
+++ b/debian/patches/020170916~27d664c.patch
@@ -0,0 +1,21 @@
+Description: Fix crash enabling rubberband with new empty instrument component
+Origin: upstream, https://github.com/hydrogen-music/hydrogen/commit/27d664c
+Author: Jérémy Zurcher <jeremy at asynk.ch>
+Bug: https://github.com/hydrogen-music/hydrogen/issues/474
+Last-Update: 2017-09-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/gui/src/InstrumentEditor/InstrumentEditor.cpp
++++ b/src/gui/src/InstrumentEditor/InstrumentEditor.cpp
+@@ -1352,8 +1352,10 @@
+ 			Instrument *pInstr = songInstrList->get( nInstr );
+ 			assert( pInstr );
+ 			if ( pInstr ){
++				InstrumentComponent* pInstrumentComponent = pInstr->get_component(m_nSelectedComponent);
++				if (!pInstrumentComponent) continue; // regular case when you have a new component empty
+ 				for ( int nLayer = 0; nLayer < MAX_LAYERS; nLayer++ ) {
+-					InstrumentLayer *pLayer = pInstr->get_component(m_nSelectedComponent)->get_layer( nLayer );
++					InstrumentLayer *pLayer = pInstrumentComponent->get_layer( nLayer );
+ 					if ( pLayer ) {
+ 						Sample *pSample = pLayer->get_sample();
+ 						if ( pSample ) {
diff --git a/debian/patches/series b/debian/patches/series
index 7696b97..2aa1f10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+020170916~27d664c.patch
 1000_portaudio_v2.patch
 1001_rubberband_path.patch
 1002_fix_locale_coverage.patch

-- 
hydrogen packaging



More information about the pkg-multimedia-commits mailing list