[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.4.0-1-9-g27b5e45

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 2077d23b1b2cf4891f6b0076660c016115d99e1b
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri Apr 13 10:32:20 2012 +0800

    Cherry-pick patch to fix Upnp crash

diff --git a/debian/patches/0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch b/debian/patches/0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch
new file mode 100644
index 0000000..d45e10b
--- /dev/null
+++ b/debian/patches/0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch
@@ -0,0 +1,32 @@
+From: Bertrand Lorentz <bertrand.lorentz at gmail.com>
+Date: Sat, 24 Mar 2012 12:27:06 +0100
+Subject: UPnPServerSource: Fix crash when getting the root object
+ (bgo#672744)
+
+Move the GetRootObject () call inside the try/catch block, so that
+exceptions from Mono.Upnp don't cause a crash.
+
+Origin: commit:b627217e3841ca7d0b8af1ed8f916436e5088cee
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672744
+---
+ .../Banshee.UPnPClient/UPnPServerSource.cs         |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
+index 04a743a..5412663 100644
+--- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
++++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
+@@ -124,10 +124,11 @@ namespace Banshee.UPnPClient
+         {
+             RemoteContentDirectory remote_dir = new RemoteContentDirectory (content_directory);
+             DateTime begin = DateTime.Now;
+-            Container root = remote_dir.GetRootObject ();
+             bool recursive_browse = !content_directory.CanSearch;
+ 
+             try {
++                Container root = remote_dir.GetRootObject ();
++
+                 if (!recursive_browse) {
+                     try {
+                         Log.Debug ("Content directory is searchable, let's search");
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 3e953d8..57dc4ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-Drop-unnecessary-libmeego-panel-moduleref.patch
 0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
 0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
+0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch

-- 
banshee