st-texture-cache: Don't add NULL textures to cache
This might cause a crash when cleaning up the cache as the hash table has cogl_object_unref as DestroyNotify function but that assumes that the passed object is a valid CoglObject. Fixes: #210
This commit is contained in:
parent
8237a1f6e0
commit
a24999b7a3
@ -520,6 +520,8 @@ finish_texture_load (AsyncTextureLoadData *data,
|
||||
goto out;
|
||||
|
||||
texdata = pixbuf_to_cogl_texture (pixbuf);
|
||||
if (!texdata)
|
||||
goto out;
|
||||
|
||||
if (data->policy != ST_TEXTURE_CACHE_POLICY_NONE)
|
||||
{
|
||||
@ -1273,6 +1275,9 @@ st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
|
||||
texdata = pixbuf_to_cogl_texture (pixbuf);
|
||||
g_object_unref (pixbuf);
|
||||
|
||||
if (!texdata)
|
||||
goto out;
|
||||
|
||||
if (policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
|
||||
{
|
||||
cogl_object_ref (texdata);
|
||||
|
Loading…
Reference in New Issue
Block a user