1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From: Michael Terry <mterry@ubuntu.com>
Date: Thu, 12 Apr 2012 15:14:55 -0400
Subject: make sure to keep a ref to jobs while they run in a thread
Origin: vendor, Ubuntu
Forwarded: no
---
daemon/gvfschannel.c | 5 +++--
daemon/gvfsdaemon.c | 7 +++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/daemon/gvfschannel.c b/daemon/gvfschannel.c
index c0c26da..fa490f6 100644
--- a/daemon/gvfschannel.c
+++ b/daemon/gvfschannel.c
@@ -644,6 +644,7 @@ send_reply_cb (GObject *source_object,
}
g_object_unref (job);
+ g_object_unref (channel);
}
/* Might be called on an i/o thread */
@@ -667,7 +668,7 @@ g_vfs_channel_send_reply (GVfsChannel *channel,
channel->priv->reply_buffer,
G_VFS_DAEMON_SOCKET_PROTOCOL_REPLY_SIZE,
0, NULL,
- send_reply_cb, channel);
+ send_reply_cb, g_object_ref (channel));
}
else
{
@@ -676,7 +677,7 @@ g_vfs_channel_send_reply (GVfsChannel *channel,
channel->priv->output_data,
channel->priv->output_data_size,
0, NULL,
- send_reply_cb, channel);
+ send_reply_cb, g_object_ref (channel));
}
}
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index f659041..7042646 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -204,6 +204,7 @@ job_handler_callback (gpointer data,
GVfsJob *job = G_VFS_JOB (data);
g_vfs_job_run (job);
+ g_object_unref (job);
}
static void
@@ -643,7 +644,8 @@ g_vfs_daemon_queue_job (GVfsDaemon *daemon,
if (!g_vfs_job_try (job))
{
/* Couldn't finish / run async, queue worker thread */
- g_thread_pool_push (daemon->thread_pool, job, NULL); /* TODO: Check error */
+ if (!g_thread_pool_push (daemon->thread_pool, g_object_ref (job), NULL)) /* TODO: Check error */
+ g_object_unref (job);
}
}
@@ -1047,7 +1049,8 @@ void
g_vfs_daemon_run_job_in_thread (GVfsDaemon *daemon,
GVfsJob *job)
{
- g_thread_pool_push (daemon->thread_pool, job, NULL); /* TODO: Check error */
+ if (!g_thread_pool_push (daemon->thread_pool, g_object_ref (job), NULL)) /* TODO: Check error */
+ g_object_unref (job);
}
void
|
