summaryrefslogtreecommitdiffstats
path: root/patches/source/glib2/glib.bug.758823.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-25 23:29:36 +0000
committer Eric Hameleers <alien@slackware.com>2018-06-01 00:36:01 +0200
commit39366733c3fe943363566756e2e152c45a1b3cb2 (patch)
tree228b0735896af90ca78151c9a69aa3efd12c8cae /patches/source/glib2/glib.bug.758823.diff
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-14.2.tar.gz
current-14.2.tar.xz
Fri May 25 23:29:36 UTC 201814.2
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.2.txz: Rebuilt. Handle removal of US/Pacific-New timezone. If we see that the machine is using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/glib2/glib.bug.758823.diff')
-rw-r--r--patches/source/glib2/glib.bug.758823.diff40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/source/glib2/glib.bug.758823.diff b/patches/source/glib2/glib.bug.758823.diff
new file mode 100644
index 00000000..e92c0368
--- /dev/null
+++ b/patches/source/glib2/glib.bug.758823.diff
@@ -0,0 +1,40 @@
+From 30359e740953b596d6c3d980dba36dd131681a1f Mon Sep 17 00:00:00 2001
+From: Allison Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 30 Nov 2015 10:13:46 -0500
+Subject: file monitors: reorder some code to avoid segfault
+
+We must initialise '->source' before we use fields inside of it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758823
+---
+ gio/glocalfilemonitor.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
+index dbd62ec..49a4dd2 100644
+--- a/gio/glocalfilemonitor.c
++++ b/gio/glocalfilemonitor.c
+@@ -748,6 +748,9 @@ g_local_file_monitor_start (GLocalFileMonitor *local_monitor,
+
+ g_assert (!local_monitor->source);
+
++ source = g_file_monitor_source_new (local_monitor, filename, is_directory, flags);
++ local_monitor->source = source; /* owns the ref */
++
+ if (is_directory && !class->mount_notify && (flags & G_FILE_MONITOR_WATCH_MOUNTS))
+ {
+ #ifdef G_OS_WIN32
+@@ -771,9 +774,6 @@ g_local_file_monitor_start (GLocalFileMonitor *local_monitor,
+ #endif
+ }
+
+- source = g_file_monitor_source_new (local_monitor, filename, is_directory, flags);
+- local_monitor->source = source; /* owns the ref */
+-
+ G_LOCAL_FILE_MONITOR_GET_CLASS (local_monitor)->start (local_monitor,
+ source->dirname, source->basename, source->filename,
+ source);
+--
+cgit v0.12
+
+