diff options
| author | Stefano Karapetsas <[email protected]> | 2012-01-04 21:28:52 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-01-04 21:28:52 +0100 |
| commit | 4a58c31e2fad6731f31c314609dc9d7ec30066d9 (patch) | |
| tree | 40a80e0b0579f5914c9d60b7fca8a364c1d7af97 /libcaja-private | |
| parent | c514038bc3e83e37a1fb3259a61fa100bc86ba88 (diff) | |
| download | caja-4a58c31e2fad6731f31c314609dc9d7ec30066d9.tar.bz2 caja-4a58c31e2fad6731f31c314609dc9d7ec30066d9.tar.xz | |
applied 15_nautilus_file_peek_crash.patch from debian nautilus 2.30.1
it solves https://bugzilla.gnome.org/show_bug.cgi?id=602500
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-file.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 4964b8d0..7877f7d2 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -3795,6 +3795,19 @@ caja_file_peek_display_name (CajaFile *file) const char *name; char *escaped_name; + /* + stefano-k: Imported 15_nautilus_file_peek_crash.patch from debian nautilus + 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 <[email protected]> + https://bugzilla.gnome.org/show_bug.cgi?id=602500 + */ + if (file == NULL || caja_file_is_gone (file)) + return ""; + /* Default to display name based on filename if its not set yet */ if (file->details->display_name == NULL) { |