diff options
| author | Matthew Waters <matthew@centricular.com> | 2016-03-16 22:19:25 +1100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-04-06 14:28:45 +0100 |
| commit | a9112ffe2d77740c9a84e7bece37412f2a0a5ab2 (patch) | |
| tree | 1f45e2941c9fbe403b6ed7fff243c80cde2e5447 | |
| parent | d59c6b3902d8a167375fd5f5d3a210a5783982a1 (diff) | |
| download | gstreamer-plugins-bad-a9112ffe2d77740c9a84e7bece37412f2a0a5ab2.tar.gz | |
wayland: fix null pointer dereference on error
gnome-shell doesn't the support wl_scaler interface which makes creating a
wayland display fail creation.
Found in the generic state changes test
| -rw-r--r-- | ext/wayland/wldisplay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/wayland/wldisplay.c b/ext/wayland/wldisplay.c index 8c5eeaf9a..758614b71 100644 --- a/ext/wayland/wldisplay.c +++ b/ext/wayland/wldisplay.c @@ -56,7 +56,8 @@ gst_wl_display_finalize (GObject * gobject) GstWlDisplay *self = GST_WL_DISPLAY (gobject); gst_poll_set_flushing (self->wl_fd_poll, TRUE); - g_thread_join (self->thread); + if (self->thread) + g_thread_join (self->thread); /* to avoid buffers being unregistered from another thread * at the same time, take their ownership */ |