[lxmusic] - Fix segfault in xmmsv_get_int (#634698)

[Christoph Wickert]

commit c100bf2b74418d62e4cb9ec931b886e3bea8992a
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Thu Nov 25 20:33:10 2010 +0100

    - Fix segfault in xmmsv_get_int (#634698)

 lxmusic-0.4.4-fix-segfault-in-xmmsv_get_int.patch |   27 +++++++++++++++++++++
 lxmusic.spec                                      |    9 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/lxmusic-0.4.4-fix-segfault-in-xmmsv_get_int.patch b/lxmusic-0.4.4-fix-segfault-in-xmmsv_get_int.patch
new file mode 100644
index 0000000..65f3068
--- /dev/null
+++ b/lxmusic-0.4.4-fix-segfault-in-xmmsv_get_int.patch
@@ -0,0 +1,27 @@
+From b036ee60a92473c8ed96093c9035afed800435f9 Mon Sep 17 00:00:00 2001
+From: Victor van den Elzen <victor.vde at gmail.com>
+Date: Tue, 23 Nov 2010 22:06:38 +0100
+Subject: [PATCH] Fix crash if "id" is not available.
+
+---
+ src/lxmusic.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxmusic.c b/src/lxmusic.c
+index b6628d1..d56990b 100644
+--- a/src/lxmusic.c
++++ b/src/lxmusic.c
+@@ -1900,8 +1900,8 @@ static int on_playlist_pos_changed( xmmsv_t* val, void* user_data )
+                     gtk_list_store_set(list_store, &it, COL_WEIGHT, PANGO_WEIGHT_BOLD, -1);
+ 
+ 		    /* update id of currently played track */
+-		    xmmsv_dict_get( val, "id", &int_value );
+-		    xmmsv_get_int( int_value, &cur_track_id );
++                    if( xmmsv_dict_get( val, "id", &int_value ) )
++                        xmmsv_get_int( int_value, &cur_track_id );
+                 }
+ 		/* scroll to currently played song */
+ 		gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(playlist_view), path, NULL, FALSE, 0.0, 0.0 );
+-- 
+1.7.3.2
+
diff --git a/lxmusic.spec b/lxmusic.spec
index 0abb283..6d34380 100644
--- a/lxmusic.spec
+++ b/lxmusic.spec
@@ -1,6 +1,6 @@
 Name:           lxmusic
 Version:        0.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Lightweight XMMS2 client with simple user interface
 
 Group:          Applications/Multimedia
@@ -10,6 +10,9 @@ Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 # As long as there are no plugins, disable the Tools menu
 Patch0:         lxmusic-0.3.0-no-tools-menu.patch
 Patch1:         lxmusic-0.4.4-libnotify-0.7.0.patch
+# https://sourceforge.net/tracker/?func=detail&atid=894869&aid=3038938&group_id=180858
+# Patch at http://paste.lisp.org/display/116965/1,1/raw
+Patch2:         lxmusic-0.4.4-fix-segfault-in-xmmsv_get_int.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0 xmms2-devel >= 0.6
@@ -25,6 +28,7 @@ player of LXDE (Lightweight X11 Desktop Environment) project.
 %prep
 %setup -q
 %patch0 -p1 -b .no-tools
+%patch2 -p1 -b .segfault-in-xmmsv_get_int
 %if 0%{?fedora} >= 15
 %patch1 -p1 -b .libnotify-0.7.0
 %endif
@@ -58,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.4-3
+- Fix segfault in xmmsv_get_int (#634698)
+
 * Wed Nov 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.4-2
 - Fix for libnotify 0.7.0