brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StTextureCache: Fix leak of key string

Browse Source 
Also micro-optimize by avoiding another strdup(), instead pass
ownership of the string when we can.

https://bugzilla.gnome.org/show_bug.cgi?id=649508
This commit is contained in:
Colin Walters 2011-05-24 12:51:47 -04:00 committed by Owen W. Taylor
parent 1278e31b65
commit 976f26cb26
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/st/st-texture-cache.c
View File

@ -1154,7 +1154,6 @@ create_texture_and_ensure_request (StTextureCache *cache,
{ {
/* Not cached and no pending request, create it */ /* Not cached and no pending request, create it */
*request = g_new0 (AsyncTextureLoadData, 1); *request = g_new0 (AsyncTextureLoadData, 1);
(*request)->key = g_strdup (key);
g_hash_table_insert (cache->priv->outstanding_requests, g_strdup (key), *request); g_hash_table_insert (cache->priv->outstanding_requests, g_strdup (key), *request);
} }
else else
@ -1209,9 +1208,10 @@ load_gicon_with_colors (StTextureCache *cache,
info = gtk_icon_theme_lookup_by_gicon (theme, icon, size, GTK_ICON_LOOKUP_USE_BUILTIN); info = gtk_icon_theme_lookup_by_gicon (theme, icon, size, GTK_ICON_LOOKUP_USE_BUILTIN);
if (info != NULL) if (info != NULL)
{ {
/* Transfer ownership of key */
request->key = key;
/* hardcoded here for now; we should actually blow this away on /* hardcoded here for now; we should actually blow this away on
* icon theme changes probably */ * icon theme changes probably */
request->key = g_strdup (key);
request->policy = ST_TEXTURE_CACHE_POLICY_FOREVER; request->policy = ST_TEXTURE_CACHE_POLICY_FOREVER;
request->icon = g_object_ref (icon); request->icon = g_object_ref (icon);
request->icon_info = info; request->icon_info = info;
@ -1227,14 +1227,13 @@ load_gicon_with_colors (StTextureCache *cache,
*/ */
g_slist_foreach (request->textures, (GFunc) g_object_unref, NULL); g_slist_foreach (request->textures, (GFunc) g_object_unref, NULL);
g_slist_free (request->textures); g_slist_free (request->textures);
g_free (request->key);
g_free (request); g_free (request);
g_hash_table_remove (cache->priv->outstanding_requests, key); g_hash_table_remove (cache->priv->outstanding_requests, key);
g_free (key);
g_object_unref (texture); g_object_unref (texture);
texture = NULL; texture = NULL;
} }
g_free (key);
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
} }