luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mention need to free returned value in g_file_enumerator_next_files_finish

Browse Source 
2008-01-29  Alexander Larsson  <alexl@redhat.com>

        * gfileenumerator.c:
        Mention need to free returned value in
	g_file_enumerator_next_files_finish docs.
	Fix leak if g_file_enumerator_next_files_finish()
	not called.



svn path=/trunk/; revision=6408
This commit is contained in:
Alexander Larsson 2008-01-29 10:35:38 +00:00 committed by Alexander Larsson
parent e064f28435
commit 1b0fce2dca
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/ChangeLog
View File

@ -1,3 +1,11 @@
2008-01-29 Alexander Larsson <alexl@redhat.com>
* gfileenumerator.c:
Mention need to free returned value in
g_file_enumerator_next_files_finish docs.
Fix leak if g_file_enumerator_next_files_finish()
not called.
2008-01-29 Alexander Larsson <alexl@redhat.com> 2008-01-29 Alexander Larsson <alexl@redhat.com>
* gcontenttype.c: * gcontenttype.c:

23
gio/gfileenumerator.c
View File

@ -336,7 +336,8 @@ g_file_enumerator_next_files_async (GFileEnumerator *enumerator,
* *
* Finishes the asynchronous operation started with g_file_enumerator_next_files_async(). * Finishes the asynchronous operation started with g_file_enumerator_next_files_async().
* *
* Returns: a #GList of #GFileInfo<!---->s. * Returns: a #GList of #GFileInfo<!---->s. You must free the list with g_list_free
* and unref the infos with g_object_unref when your done with them.
**/ **/
GList * GList *
g_file_enumerator_next_files_finish (GFileEnumerator *enumerator, g_file_enumerator_next_files_finish (GFileEnumerator *enumerator,
@ -529,6 +530,18 @@ typedef struct {
GList *files; GList *files;
} NextAsyncOp; } NextAsyncOp;
static void
next_async_op_free (NextAsyncOp *op)
{
/* Free the list, if finish wasn't called */
g_list_foreach (op->files, (GFunc)g_object_unref, NULL);
g_list_free (op->files);
g_free (op);
}
static void static void
next_files_thread (GSimpleAsyncResult *res, next_files_thread (GSimpleAsyncResult *res,
GObject *object, GObject *object,
@ -573,7 +586,6 @@ next_files_thread (GSimpleAsyncResult *res,
} }
} }
static void static void
g_file_enumerator_real_next_files_async (GFileEnumerator *enumerator, g_file_enumerator_real_next_files_async (GFileEnumerator *enumerator,
int num_files, int num_files,
@ -591,7 +603,7 @@ g_file_enumerator_real_next_files_async (GFileEnumerator *enumerator,
op->files = NULL; op->files = NULL;
res = g_simple_async_result_new (G_OBJECT (enumerator), callback, user_data, g_file_enumerator_real_next_files_async); res = g_simple_async_result_new (G_OBJECT (enumerator), callback, user_data, g_file_enumerator_real_next_files_async);
g_simple_async_result_set_op_res_gpointer (res, op, g_free); g_simple_async_result_set_op_res_gpointer (res, op, (GDestroyNotify) next_async_op_free);
g_simple_async_result_run_in_thread (res, next_files_thread, io_priority, cancellable); g_simple_async_result_run_in_thread (res, next_files_thread, io_priority, cancellable);
g_object_unref (res); g_object_unref (res);
@ -604,13 +616,16 @@ g_file_enumerator_real_next_files_finish (GFileEnumerator *enumer
{ {
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
NextAsyncOp *op; NextAsyncOp *op;
GList *res;
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_warn_if_fail (g_simple_async_result_get_source_tag (simple) ==
g_file_enumerator_real_next_files_async); g_file_enumerator_real_next_files_async);
op = g_simple_async_result_get_op_res_gpointer (simple); op = g_simple_async_result_get_op_res_gpointer (simple);
return op->files; res = op->files;
op->files = NULL;
return res;
} }
static void static void