|
 |
8156c2 |
From 23c81629d775fd902e4bee7ec0a182a916f4252b Mon Sep 17 00:00:00 2001
|
|
|
8156c2 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
8156c2 |
Date: Mon, 16 Sep 2019 16:17:48 +0200
|
|
|
8156c2 |
Subject: [PATCH 1/3] idle-monitor: Make helper function static
|
|
|
8156c2 |
|
|
|
8156c2 |
It wasn't used outside the file, so no reason to not have it static.
|
|
|
8156c2 |
|
|
|
8156c2 |
https://gitlab.gnome.org/GNOME/mutter/merge_requests/799
|
|
|
8156c2 |
---
|
|
|
8156c2 |
src/backends/meta-idle-monitor-private.h | 1 -
|
|
|
8156c2 |
src/backends/meta-idle-monitor.c | 8 ++++----
|
|
|
8156c2 |
2 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
8156c2 |
|
|
|
8156c2 |
diff --git a/src/backends/meta-idle-monitor-private.h b/src/backends/meta-idle-monitor-private.h
|
|
|
8156c2 |
index 82f3f87b7..9ce7e743a 100644
|
|
|
8156c2 |
--- a/src/backends/meta-idle-monitor-private.h
|
|
|
8156c2 |
+++ b/src/backends/meta-idle-monitor-private.h
|
|
|
8156c2 |
@@ -54,7 +54,6 @@ struct _MetaIdleMonitorClass
|
|
|
8156c2 |
GObjectClass parent_class;
|
|
|
8156c2 |
};
|
|
|
8156c2 |
|
|
|
8156c2 |
-void _meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch);
|
|
|
8156c2 |
void meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor);
|
|
|
8156c2 |
|
|
|
8156c2 |
#endif /* META_IDLE_MONITOR_PRIVATE_H */
|
|
|
8156c2 |
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
index 2c06ee73c..ce1b87bbb 100644
|
|
|
8156c2 |
--- a/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
+++ b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
@@ -54,8 +54,8 @@ static GParamSpec *obj_props[PROP_LAST];
|
|
|
8156c2 |
|
|
|
8156c2 |
G_DEFINE_TYPE (MetaIdleMonitor, meta_idle_monitor, G_TYPE_OBJECT)
|
|
|
8156c2 |
|
|
|
8156c2 |
-void
|
|
|
8156c2 |
-_meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch)
|
|
|
8156c2 |
+static void
|
|
|
8156c2 |
+meta_idle_monitor_watch_fire (MetaIdleMonitorWatch *watch)
|
|
|
8156c2 |
{
|
|
|
8156c2 |
MetaIdleMonitor *monitor;
|
|
|
8156c2 |
guint id;
|
|
|
8156c2 |
@@ -319,7 +319,7 @@ idle_monitor_dispatch_timeout (GSource *source,
|
|
|
8156c2 |
if (ready_time > now)
|
|
|
8156c2 |
return G_SOURCE_CONTINUE;
|
|
|
8156c2 |
|
|
|
8156c2 |
- _meta_idle_monitor_watch_fire (watch);
|
|
|
8156c2 |
+ meta_idle_monitor_watch_fire (watch);
|
|
|
8156c2 |
g_source_set_ready_time (watch->timeout_source, -1);
|
|
|
8156c2 |
|
|
|
8156c2 |
return G_SOURCE_CONTINUE;
|
|
|
8156c2 |
@@ -506,7 +506,7 @@ meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor)
|
|
|
8156c2 |
|
|
|
8156c2 |
if (watch->timeout_msec == 0)
|
|
|
8156c2 |
{
|
|
|
8156c2 |
- _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
|
|
|
8156c2 |
+ meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
|
|
|
8156c2 |
}
|
|
|
8156c2 |
else
|
|
|
8156c2 |
{
|
|
|
8156c2 |
--
|
|
|
8156c2 |
2.23.0
|
|
|
8156c2 |
|
|
|
8156c2 |
|
|
|
8156c2 |
From 0d43bbdae0a08c7618e789fa0d5270615c907a36 Mon Sep 17 00:00:00 2001
|
|
|
8156c2 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
8156c2 |
Date: Mon, 16 Sep 2019 16:36:05 +0200
|
|
|
8156c2 |
Subject: [PATCH 2/3] idle-monitor: Remove redundant type cast
|
|
|
8156c2 |
|
|
|
8156c2 |
No need to type cast a `MetaIdleMonitorWatch *` to a
|
|
|
8156c2 |
`MetaIdleMonitorWatch *`.
|
|
|
8156c2 |
|
|
|
8156c2 |
https://gitlab.gnome.org/GNOME/mutter/merge_requests/799
|
|
|
8156c2 |
---
|
|
|
8156c2 |
src/backends/meta-idle-monitor.c | 2 +-
|
|
|
8156c2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
8156c2 |
|
|
|
8156c2 |
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
index ce1b87bbb..3dbb89944 100644
|
|
|
8156c2 |
--- a/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
+++ b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
@@ -506,7 +506,7 @@ meta_idle_monitor_reset_idletime (MetaIdleMonitor *monitor)
|
|
|
8156c2 |
|
|
|
8156c2 |
if (watch->timeout_msec == 0)
|
|
|
8156c2 |
{
|
|
|
8156c2 |
- meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch);
|
|
|
8156c2 |
+ meta_idle_monitor_watch_fire (watch);
|
|
|
8156c2 |
}
|
|
|
8156c2 |
else
|
|
|
8156c2 |
{
|
|
|
8156c2 |
--
|
|
|
8156c2 |
2.23.0
|
|
|
8156c2 |
|
|
|
8156c2 |
|
|
|
8156c2 |
From f6c24dd45c14dd16d6878ebf170f8468ad3d47e1 Mon Sep 17 00:00:00 2001
|
|
|
8156c2 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
8156c2 |
Date: Mon, 16 Sep 2019 16:36:51 +0200
|
|
|
8156c2 |
Subject: [PATCH 3/3] idle-monitor: Reset timeout before firing watch
|
|
|
8156c2 |
|
|
|
8156c2 |
The watch might be removed during firing, meaning the source is
|
|
|
8156c2 |
destroyed after returning. Avoid use-after-free by unsetting the timeout
|
|
|
8156c2 |
before firing. Returning G_SOURCE_CONTINUE in that case is harmless, as
|
|
|
8156c2 |
source is destroyed.
|
|
|
8156c2 |
|
|
|
8156c2 |
Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/796
|
|
|
8156c2 |
|
|
|
8156c2 |
https://gitlab.gnome.org/GNOME/mutter/merge_requests/799
|
|
|
8156c2 |
---
|
|
|
8156c2 |
src/backends/meta-idle-monitor.c | 3 ++-
|
|
|
8156c2 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
8156c2 |
|
|
|
8156c2 |
diff --git a/src/backends/meta-idle-monitor.c b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
index 3dbb89944..c6e814468 100644
|
|
|
8156c2 |
--- a/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
+++ b/src/backends/meta-idle-monitor.c
|
|
|
8156c2 |
@@ -319,9 +319,10 @@ idle_monitor_dispatch_timeout (GSource *source,
|
|
|
8156c2 |
if (ready_time > now)
|
|
|
8156c2 |
return G_SOURCE_CONTINUE;
|
|
|
8156c2 |
|
|
|
8156c2 |
- meta_idle_monitor_watch_fire (watch);
|
|
|
8156c2 |
g_source_set_ready_time (watch->timeout_source, -1);
|
|
|
8156c2 |
|
|
|
8156c2 |
+ meta_idle_monitor_watch_fire (watch);
|
|
|
8156c2 |
+
|
|
|
8156c2 |
return G_SOURCE_CONTINUE;
|
|
|
8156c2 |
}
|
|
|
8156c2 |
|
|
|
8156c2 |
--
|
|
|
8156c2 |
2.23.0
|
|
|
8156c2 |
|