[arch-commits] Commit in totem/trunk (PKGBUILD fix_crash.patch)

[Ionut Biru]

    Date: Saturday, June 18, 2011 @ 15:41:13
  Author: ibiru
Revision: 127845

fix crasher. FS#24479

Added:
  totem/trunk/fix_crash.patch
Modified:
  totem/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   10 +++++++---
 fix_crash.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-18 19:22:07 UTC (rev 127844)
+++ PKGBUILD	2011-06-18 19:41:13 UTC (rev 127845)
@@ -4,7 +4,7 @@
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.0.1
-pkgrel=2
+pkgrel=3
 url="http://www.gnome.org"
 arch=('i686' 'x86_64')
 license=('GPL2' 'custom')
@@ -12,11 +12,15 @@
     'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata'
     'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2
+       fix_crash.patch)
+sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a'
+            '65125a0b8a1fd7f8840b2b7528de3bc553689e224a9aa3fd2c459918ab6f1f1c')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/totem \
       --localstatedir=/var --disable-static \

Added: fix_crash.patch
===================================================================
--- fix_crash.patch	                        (rev 0)
+++ fix_crash.patch	2011-06-18 19:41:13 UTC (rev 127845)
@@ -0,0 +1,30 @@
+From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001
+From: Marcel van den Hof <marcelvdh at gmail.com>
+Date: Sun, 29 May 2011 23:45:36 +0100
+Subject: [PATCH] Fix segfault in Bemused plugin
+
+If bluetoothd is not running sdp_connect() returns a null value which
+will cause the plugin to segfault.
+
+This patch adds a check for a possible null value from sdp_connect().
+---
+ src/plugins/bemused/totem-bemused.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c
+index 584b4d3..c51a0ee 100644
+--- a/src/plugins/bemused/totem-bemused.c
++++ b/src/plugins/bemused/totem-bemused.c
+@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port,
+ 
+ 	/* Connect to the local SDP server, register the service record */
+ 	session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0);
+-	sdp_record_register (session, &record, 0);
++	if (session != NULL)	
++		sdp_record_register (session, &record, 0);
+ 
+ 	/* Cleanup */
+ 	sdp_data_free (channel);
+-- 
+1.7.5.2
+