hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lets not segv if src is null :) 

SVN revision: 74978
This commit is contained in:
Carsten Haitzler 2012-08-07 10:59:44 +00:00
parent 1284e077ad
commit 6e0f9db089
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -453,30 +453,33 @@ evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
abort(); abort();
return EINA_FALSE; return EINA_FALSE;
} }
if (src->delete_me) if (src)
{ {
CRIT("Setting object %p to deleted image source %p", src, obj); if (src->delete_me)
abort(); {
return EINA_FALSE; CRIT("Setting object %p to deleted image source %p", src, obj);
} abort();
if (!src->layer) return EINA_FALSE;
{ }
CRIT("No evas surface associated with source object (%p)", obj); if (!src->layer)
abort(); {
return EINA_FALSE; CRIT("No evas surface associated with source object (%p)", obj);
} abort();
if ((obj->layer && src->layer) && return EINA_FALSE;
(obj->layer->evas != src->layer->evas)) }
{ if ((obj->layer && src->layer) &&
CRIT("Setting object %p from Evas (%p) from another Evas (%p)", src, src->layer->evas, obj->layer->evas); (obj->layer->evas != src->layer->evas))
abort(); {
return EINA_FALSE; CRIT("Setting object %p from Evas (%p) from another Evas (%p)", src, src->layer->evas, obj->layer->evas);
} abort();
if (src == obj) return EINA_FALSE;
{ }
CRIT("Setting object %p as a source for itself", obj); if (src == obj)
abort(); {
return EINA_FALSE; CRIT("Setting object %p as a source for itself", obj);
abort();
return EINA_FALSE;
}
} }
if (o->cur.source == src) return EINA_TRUE; if (o->cur.source == src) return EINA_TRUE;
@ -485,10 +488,7 @@ evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
if (o->cur.file || o->cur.key) if (o->cur.file || o->cur.key)
evas_object_image_file_set(obj, NULL, NULL); evas_object_image_file_set(obj, NULL, NULL);
if (src) if (src) _proxy_set(obj, src);
{
_proxy_set(obj, src);
}
return EINA_TRUE; return EINA_TRUE;
} }