callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash if an object has a NULL name. Move variables to local scopes.

Browse Source 
2008-05-20  Michael Natterer  <mitch@gimp.org>

	* app/core/gimplist.c (gimp_list_uniquefy_name): don't crash if an
	object has a NULL name. Move variables to local scopes. Remove
	redundant casts.


svn path=/trunk/; revision=25723
This commit is contained in:
Michael Natterer
2008-05-20 21:30:40 +00:00
committed by Michael Natterer
parent 889cc7155a
commit b646fd3d17
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-05-20 Michael Natterer <mitch@gimp.org>
* app/core/gimplist.c (gimp_list_uniquefy_name): don't crash if an
object has a NULL name. Move variables to local scopes. Remove
redundant casts.
2008-05-20 Martin Nordholts <martinn@svn.gnome.org> 2008-05-20 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimpfreeselecttool.c: Increase handle size to 12 * app/tools/gimpfreeselecttool.c: Increase handle size to 12

39
app/core/gimplist.c
View File

@ -487,24 +487,25 @@ static void
gimp_list_uniquefy_name (GimpList *gimp_list, gimp_list_uniquefy_name (GimpList *gimp_list,
GimpObject *object) GimpObject *object)
{ {
GList *list; GList *list;
GList *list2; const gchar *name = gimp_object_get_name (object);
gint unique_ext = 0;
gchar *new_name = NULL;
gchar *ext;
g_return_if_fail (GIMP_IS_LIST (gimp_list)); if (! name)
g_return_if_fail (GIMP_IS_OBJECT (object)); return;
for (list = gimp_list->list; list; list = g_list_next (list)) for (list = gimp_list->list; list; list = g_list_next (list))
{ {
GimpObject *object2 = GIMP_OBJECT (list->data); GimpObject *object2 = list->data;
const gchar *name2 = gimp_object_get_name (object2);
if (object != object2 && if (object != object2 &&
strcmp (gimp_object_get_name (GIMP_OBJECT (object)), name2 &&
gimp_object_get_name (GIMP_OBJECT (object2))) == 0) ! strcmp (name, name2))
{ {
ext = strrchr (object->name, '#'); GList *list2;
gchar *ext = strrchr (name, '#');
gchar *new_name = NULL;
gint unique_ext = 0;
if (ext) if (ext)
{ {
@ -526,10 +527,6 @@ gimp_list_uniquefy_name (GimpList *gimp_list,
g_free (ext_str); g_free (ext_str);
} }
else
{
unique_ext = 0;
}
do do
{ {
@ -537,16 +534,16 @@ gimp_list_uniquefy_name (GimpList *gimp_list,
g_free (new_name); g_free (new_name);
new_name = g_strdup_printf ("%s#%d", object->name, unique_ext); new_name = g_strdup_printf ("%s#%d", name, unique_ext);
for (list2 = gimp_list->list; list2; list2 = g_list_next (list2)) for (list2 = gimp_list->list; list2; list2 = g_list_next (list2))
{ {
object2 = GIMP_OBJECT (list2->data); object2 = list2->data;
name2 = gimp_object_get_name (object2);
if (object == object2) if (object != object2 &&
continue; name2 &&
! strcmp (new_name, name2))
if (! strcmp (object2->name, new_name))
break; break;
} }
} }