summaryrefslogtreecommitdiff
path: root/libraries/libfm/libfm_issue_3557764.patch
diff options
context:
space:
mode:
authorponce <matteo.bernardini@gmail.com>2012-08-16 10:18:49 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-08-21 08:55:33 -0500
commitb95c1e9a4ae30d8234448bf7fbbb2e3ce45220c9 (patch)
treefe5a0110135e45f1a62382be217238be6baecf96 /libraries/libfm/libfm_issue_3557764.patch
parent4ff631ec0a3a1a336f9d5c328ca4c166f0b4ebc6 (diff)
downloadslackbuilds-b95c1e9a4ae30d8234448bf7fbbb2e3ce45220c9.tar.gz
libraries/libfm: Updated for version 1.0.
This also adds a small patch from upstream for bug 3557764. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries/libfm/libfm_issue_3557764.patch')
-rw-r--r--libraries/libfm/libfm_issue_3557764.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/libraries/libfm/libfm_issue_3557764.patch b/libraries/libfm/libfm_issue_3557764.patch
new file mode 100644
index 0000000000..adec5a84f9
--- /dev/null
+++ b/libraries/libfm/libfm_issue_3557764.patch
@@ -0,0 +1,42 @@
+From f5dd721cd06761af60ea6003fa8832a65df2ea7e Mon Sep 17 00:00:00 2001
+From: Andriy Grytsenko <andrej@rep.kiev.ua>
+Date: Thu, 16 Aug 2012 02:45:36 +0300
+Subject: [PATCH] quickfix for #3557764: pcmanfm-1.0 segfault in fm_file_info_is_image
+
+---
+ src/gtk/fm-folder-model.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/gtk/fm-folder-model.c b/src/gtk/fm-folder-model.c
+index b80aa5c..2406698 100644
+--- a/src/gtk/fm-folder-model.c
++++ b/src/gtk/fm-folder-model.c
+@@ -1331,12 +1331,16 @@ static void on_thumbnail_max_changed(FmConfig* cfg, gpointer user_data)
+ {
+ FmFolderModel* model = (FmFolderModel*)user_data;
+ FmThumbnailRequest* req;
+- GList* new_reqs = NULL, *l;
++ GList* new_reqs = NULL;
+ GSequenceIter* seq_it;
+ FmFileInfo* fi;
+ guint thumbnail_max_bytes = fm_config->thumbnail_max << 10;
+ goffset size;
+
++#if 0
++ /* disabled due to bug #3557764: pcmanfm-1.0 segfault in fm_file_info_is_image
++ access to FmThumbnailRequest is dangerous in this implementation
++ and thumbnail generator anyway respects cfg->thumbnail_max */
+ if(cfg->thumbnail_max)
+ {
+ /* remove files which are too big from thumbnail requests
+@@ -1357,6 +1361,7 @@ static void on_thumbnail_max_changed(FmConfig* cfg, gpointer user_data)
+ l = next;
+ }
+ }
++#endif
+ seq_it = g_sequence_get_begin_iter(model->items);
+ while( !g_sequence_iter_is_end(seq_it) )
+ {
+--
+1.7.4.1
+