forked from enlightenment/efl
more null checks in evas to avoid segs.
SVN revision: 79167
This commit is contained in:
parent
4acb015724
commit
208ad94428
|
@ -219,26 +219,22 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||||
if (clip->delete_me)
|
if (clip->delete_me)
|
||||||
{
|
{
|
||||||
CRIT("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
|
CRIT("Setting deleted object %p as clip obj %p", eo_clip, eo_obj);
|
||||||
abort();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (obj->delete_me)
|
if (obj->delete_me)
|
||||||
{
|
{
|
||||||
CRIT("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
|
CRIT("Setting object %p as clip to deleted obj %p", eo_clip, eo_obj);
|
||||||
abort();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!obj->layer)
|
if (!obj->layer)
|
||||||
{
|
{
|
||||||
CRIT("No evas surface associated with object (%p)", eo_obj);
|
CRIT("No evas surface associated with object (%p)", eo_obj);
|
||||||
abort();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ((obj->layer && clip->layer) &&
|
if ((obj->layer && clip->layer) &&
|
||||||
(obj->layer->evas != clip->layer->evas))
|
(obj->layer->evas != clip->layer->evas))
|
||||||
{
|
{
|
||||||
CRIT("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
|
CRIT("Setting object %p from Evas (%p) to another Evas (%p)", obj, obj->layer->evas, clip->layer->evas);
|
||||||
abort();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1939,7 +1939,7 @@ eng_image_native_set(void *data, void *image, void *native)
|
||||||
ERR("Try glXCreatePixmap on GLX with no support");
|
ERR("Try glXCreatePixmap on GLX with no support");
|
||||||
if (n->glx_pixmap)
|
if (n->glx_pixmap)
|
||||||
{
|
{
|
||||||
// printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
|
// printf("%p: new native texture for %x | %4i x %4i @ %2i = %p\n",
|
||||||
// n, pm, w, h, depth, n->glx_pixmap);
|
// n, pm, w, h, depth, n->glx_pixmap);
|
||||||
if (!target)
|
if (!target)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue