On Tue, 3 May 2016 15:08:37 +0200 Quentin Glidic <sardemff7+wayl...@sardemff7.net> wrote:
> On 02/05/2016 23:40, Emmanuel Gil Peyrot wrote: > > When pixman is used and no connector could be found (or any other > > error), drm_backend_create() tried to destroy a gbm_device that would > > only be created in init_egl(), resulting in a segfault. > > > > Signed-off-by: Emmanuel Gil Peyrot <emmanuel.pey...@collabora.com> > > --- > > src/compositor-drm.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/src/compositor-drm.c b/src/compositor-drm.c > > index c11562f..f9a997b 100644 > > --- a/src/compositor-drm.c > > +++ b/src/compositor-drm.c > > @@ -3227,7 +3227,8 @@ err_drm_source: > > err_udev_input: > > udev_input_destroy(&b->input); > > err_sprite: > > - gbm_device_destroy(b->gbm); > > + if (b->gbm) > > + gbm_device_destroy(b->gbm); > > destroy_sprites(b); > > err_udev_dev: > > udev_device_unref(drm_device); > > > > > Reviewed-by: Quentin Glidic <sardemff7+...@sardemff7.net> > > Should land on its own. > Hi, patches 1, 2 and 4 pushed: 130ae6e..b8347e3 master -> master Patch 2 with the long line fix. The rest we might want to defer for after 1.11. Thanks, pq
pgppsA0hPnljD.pgp
Description: OpenPGP digital signature
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
