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

wayland_shm - clean out ptrs after free - seeing invalid mem/ptr access 

enlightenment internal windows insta segv e on rpi. after much hunting
it seems a fallback is happening and bunk ptrs are being used. this at
least will make the problems more reliable with null ptrs.
This commit is contained in:
Carsten Haitzler 2017-09-02 21:47:18 +09:00
parent 6e30535a3c
commit d42ec53154
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/evas/engines/wayland_shm/evas_dmabuf.c
View File

@ -479,6 +479,7 @@ _allocation_complete(Dmabuf_Buffer *b)
* buffer type...
*/
_fallback(b->surface, b->w, b->h);
b->surface = NULL;
}
static void
@ -591,12 +592,13 @@ _evas_dmabuf_surface_reconfigure(Surface *s, int w, int h, uint32_t flags EINA_U
_evas_dmabuf_buffer_destroy(b);
}
buf = _evas_dmabuf_buffer_init(surface, w, h);
surface->buffer[i] = buf;
if (!buf)
{
_fallback(surface, w, h);
s->surf.dmabuf = NULL;
return;
}
surface->buffer[i] = buf;
}
}
@ -758,6 +760,8 @@ _internal_evas_dmabuf_surface_destroy(Dmabuf_Surface *surface)
_evas_dmabuf_buffer_destroy(surface->buffer[i]);
free(surface->buffer);
surface->buffer = NULL;
surface->nbuf = 0;
free(surface);
}

1
src/modules/evas/engines/wayland_shm/evas_shm.c
View File

@ -394,6 +394,7 @@ _evas_shm_surface_destroy(Surface *surface)
_shm_leaf_destroy(&surface->surf.shm->leaf[i]);
free(surface->surf.shm);
surface->surf.shm = NULL;
}
void