luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-14 03:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Plug a memory leak in g_simple_async_result_set_op_res_gpointer

Browse Source 
Fixes bug 579272.
This commit is contained in:
Matthias Clasen 2009-05-02 22:59:02 -04:00
parent 79ef3d3264
commit 2e4b51aeb3
1 changed files with 13 additions and 2 deletions

15
gio/gsimpleasyncresult.c

@ -144,6 +144,15 @@ G_DEFINE_TYPE_WITH_CODE (GSimpleAsyncResult, g_simple_async_result, G_TYPE_OBJEC
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_RESULT, G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_RESULT,
g_simple_async_result_async_result_iface_init)) g_simple_async_result_async_result_iface_init))
static void
clear_op_res (GSimpleAsyncResult *simple)
{
if (simple->destroy_op_res)
simple->destroy_op_res (simple->op_res.v_pointer);
simple->destroy_op_res = NULL;
simple->op_res.v_ssize = 0;
}
static void static void
g_simple_async_result_finalize (GObject *object) g_simple_async_result_finalize (GObject *object)
{ {
@ -154,8 +163,7 @@ g_simple_async_result_finalize (GObject *object)
if (simple->source_object) if (simple->source_object)
g_object_unref (simple->source_object); g_object_unref (simple->source_object);
if (simple->destroy_op_res) clear_op_res (simple);
simple->destroy_op_res (simple->op_res.v_pointer);
if (simple->error) if (simple->error)
g_error_free (simple->error); g_error_free (simple->error);
@ -375,6 +383,7 @@ g_simple_async_result_set_op_res_gpointer (GSimpleAsyncResult *simple,
{ {
g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple)); g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple));
clear_op_res (simple);
simple->op_res.v_pointer = op_res; simple->op_res.v_pointer = op_res;
simple->destroy_op_res = destroy_op_res; simple->destroy_op_res = destroy_op_res;
} }
@ -407,6 +416,7 @@ g_simple_async_result_set_op_res_gssize (GSimpleAsyncResult *simple,
gssize op_res) gssize op_res)
{ {
g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple)); g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple));
clear_op_res (simple);
simple->op_res.v_ssize = op_res; simple->op_res.v_ssize = op_res;
} }
@ -437,6 +447,7 @@ g_simple_async_result_set_op_res_gboolean (GSimpleAsyncResult *simple,
gboolean op_res) gboolean op_res)
{ {
g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple)); g_return_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple));
clear_op_res (simple);
simple->op_res.v_boolean = !!op_res; simple->op_res.v_boolean = !!op_res;
} }