r26742 - in /desktop/unstable/nautilus/debian: changelog patches/15_nautilus_file_peek_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 27 11:50:12 2011
New Revision: 26742

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26742
Log:
15_nautilus_file_peek_crash.patch: stolen from upstream git. Fix a 
crasher with lots of upstream duplicates from squeeze systems.

Added:
    desktop/unstable/nautilus/debian/patches/15_nautilus_file_peek_crash.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=26742&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Sun Feb 27 11:50:12 2011
@@ -1,3 +1,10 @@
+nautilus (2.30.1-3) unstable; urgency=low
+
+  * 15_nautilus_file_peek_crash.patch: stolen from upstream git. Fix a 
+    crasher with lots of upstream duplicates from squeeze systems.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 27 Feb 2011 12:50:09 +0100
+
 nautilus (2.30.1-2) unstable; urgency=low
 
   * Drop type-handling usage. Closes: #587872.

Added: desktop/unstable/nautilus/debian/patches/15_nautilus_file_peek_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/15_nautilus_file_peek_crash.patch?rev=26742&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/15_nautilus_file_peek_crash.patch (added)
+++ desktop/unstable/nautilus/debian/patches/15_nautilus_file_peek_crash.patch [utf-8] Sun Feb 27 11:50:12 2011
@@ -1,0 +1,29 @@
+From b10ccbc58d8d7f2ebb9ded079ec2a36e2f4603ad Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Thu, 27 Jan 2011 10:22:10 +0000
+Subject: Prevent a crash in nautilus_file_peek_display_name() on invalid NautilusFile
+
+This is more a workaround only, expect assert failures at other
+places when something bad happens. There's a race condition somewhere,
+this patch only prevents immediate crash.
+
+Patch by Marcus Husar <marcus.husar at rose.uni-heidelberg.de>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=602500
+---
+diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
+index 2c5b868..c854163 100644
+--- a/libnautilus-private/nautilus-file.c
++++ b/libnautilus-private/nautilus-file.c
+@@ -3780,6 +3780,9 @@ nautilus_file_peek_display_name (NautilusFile *file)
+ 	const char *name;
+ 	char *escaped_name;
+ 
++	if (file == NULL || nautilus_file_is_gone (file))
++		return "";
++
+ 	/* Default to display name based on filename if its not set yet */
+ 	
+ 	if (file->details->display_name == NULL) {
+--
+cgit v0.8.3.4

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=26742&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Sun Feb 27 11:50:12 2011
@@ -4,6 +4,7 @@
 12_list-view_expand.patch
 13_shortcuts.patch
 14_dont_show_umount.patch
+15_nautilus_file_peek_crash.patch
 20_open-with_install.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch