summaryrefslogtreecommitdiffstats
path: root/main/nautilus/001-filepeek-crash.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-25 18:06:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-25 19:53:02 +0000
commit286429b1aa72ee964ba0cac4b79c754859b1c60a (patch)
tree33c01e6792fd99a430be126c19b9b71947ffd060 /main/nautilus/001-filepeek-crash.patch
parent3597c695c8ae4a22da8bd26c363aa8ceae267be3 (diff)
downloadaports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.bz2
aports-286429b1aa72ee964ba0cac4b79c754859b1c60a.tar.xz
main/nautilus: upgrade to 2.32.2.1
Diffstat (limited to 'main/nautilus/001-filepeek-crash.patch')
-rw-r--r--main/nautilus/001-filepeek-crash.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/main/nautilus/001-filepeek-crash.patch b/main/nautilus/001-filepeek-crash.patch
new file mode 100644
index 000000000..82a210dd2
--- /dev/null
+++ b/main/nautilus/001-filepeek-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.9