[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SRM] Stable update for nautilus



Hi,

upstream receives a lot of the same crashes for the nautilus version in
squeeze. It’s not easily reproducible but there’s a workaround that
prevents that from happening and cannot harm.

nautilus (2.30.1-2squeeze1) stable; urgency=low

  * 15_nautilus_file_peek_crash.patch: stolen from upstream git. Fix a 
    crasher with lots of upstream duplicates from squeeze systems.

Patch attached.

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'  “If you behave this way because you are blackmailed by someone,
  `-    […] I will see what I can do for you.”  -- Jörg Schilling

diff -u nautilus-2.30.1/debian/changelog nautilus-2.30.1/debian/changelog
--- nautilus-2.30.1/debian/changelog
+++ nautilus-2.30.1/debian/changelog
@@ -1,3 +1,10 @@
+nautilus (2.30.1-2squeeze1) stable; 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@debian.org>  Sun, 27 Feb 2011 13:14:09 +0100
+
 nautilus (2.30.1-2) unstable; urgency=low
 
   * Drop type-handling usage. Closes: #587872.
diff -u nautilus-2.30.1/debian/patches/series nautilus-2.30.1/debian/patches/series
--- nautilus-2.30.1/debian/patches/series
+++ nautilus-2.30.1/debian/patches/series
@@ -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
only in patch2:
unchanged:
--- nautilus-2.30.1.orig/debian/patches/15_nautilus_file_peek_crash.patch
+++ nautilus-2.30.1/debian/patches/15_nautilus_file_peek_crash.patch
@@ -0,0 +1,29 @@
+From b10ccbc58d8d7f2ebb9ded079ec2a36e2f4603ad Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@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@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

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: