[SCM] cmus/master: Add patch taken from upstream's git to fix segfault when adding to queue.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Jan 11 13:56:06 UTC 2011


The following commit has been merged in the master branch:
commit 51e1cd4caa88c48e0907c9c52c9e7faf79a213f7
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 11 14:54:51 2011 +0100

    Add patch taken from upstream's git to fix segfault when adding to queue.
    
    The play_queue.c module was using the editable.c functions
    inconsistently (sometimes through editable_add, sometimes directly
    modifying the internal linked list). This caused the internal rbtree to
    degenerate.

diff --git a/debian/patches/20-segfault_on_adding_to_queue.patch b/debian/patches/20-segfault_on_adding_to_queue.patch
new file mode 100644
index 0000000..0090cad
--- /dev/null
+++ b/debian/patches/20-segfault_on_adding_to_queue.patch
@@ -0,0 +1,21 @@
+Subject: Fix segfault when adding to queue.
+Origin: upstream, commit:8ec61d412b7a
+---
+ play_queue.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- cmus.orig/play_queue.c
++++ cmus/play_queue.c
+@@ -26,7 +26,11 @@ void play_queue_append(struct track_info
+ {
+ 	struct simple_track *t = simple_track_new(ti);
+ 
+-	editable_add(&pq_editable, t);
++	list_add_tail(&t->node, &pq_editable.head);
++	pq_editable.nr_tracks++;
++	if (t->info->duration != -1)
++		pq_editable.total_time += t->info->duration;
++	window_changed(pq_editable.win);
+ }
+ 
+ void play_queue_prepend(struct track_info *ti)
diff --git a/debian/patches/series b/debian/patches/series
index 6feb1b9..074df25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_cmus-tutorial_whatis.diff
 03-terminal_corruption.patch
 10-roaraudio_support.patch
+20-segfault_on_adding_to_queue.patch

-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list