luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 558185 – 'parent' variable in

Browse Source 
2008-10-31  Grahame Bowland  <grahame@angrygoats.net>

	Bug 558185 – 'parent' variable in g_local_file_get_child_for_display_name() 
	hits g_object_unref(NULL) assertion

	* gio/glocalfile.c: 
	- remove unused variable. Patch by Matt Johnston <matt@ucc.asn.au>

svn path=/trunk/; revision=7636
This commit is contained in:
Grahame Bowland 2008-10-31 02:23:55 +00:00 committed by Grahame Michael Bowland
parent b54e0af92f
commit df719f749c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-10-31 Grahame Bowland <grahame@angrygoats.net>
Bug 558185 – 'parent' variable in g_local_file_get_child_for_display_name()
hits g_object_unref(NULL) assertion
* gio/glocalfile.c:
- remove unused variable. Patch by Matt Johnston <matt@ucc.asn.au>
2008-10-29 16:11:14 Tim Janik <timj@gtk.org> 2008-10-29 16:11:14 Tim Janik <timj@gtk.org>
* glib/gmacros.h: added G_PASTE() and G_STATIC_ASSERT(), based on * glib/gmacros.h: added G_PASTE() and G_STATIC_ASSERT(), based on

4
gio/glocalfile.c
View File

@ -592,7 +592,7 @@ g_local_file_get_child_for_display_name (GFile *file,
const char *display_name, const char *display_name,
GError **error) GError **error)
{ {
GFile *parent, *new_file; GFile *new_file;
char *basename; char *basename;
basename = g_filename_from_utf8 (display_name, -1, NULL, NULL, NULL); basename = g_filename_from_utf8 (display_name, -1, NULL, NULL, NULL);
@ -604,9 +604,7 @@ g_local_file_get_child_for_display_name (GFile *file,
return NULL; return NULL;
} }
parent = g_file_get_parent (file);
new_file = g_file_get_child (file, basename); new_file = g_file_get_child (file, basename);
g_object_unref (parent);
g_free (basename); g_free (basename);
return new_file; return new_file;