diff options
| author | Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> | 2018-03-30 22:31:46 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-04-02 12:27:35 -0400 |
| commit | 258081759fa70202a2e6134eeee4fe25ca54bedb (patch) | |
| tree | dcb6df5c543d6231ebd88a150b81051cd7a8de38 /glamor | |
| parent | debf75bd0b0ddfec82dad9580efa7d19479b55df (diff) | |
glamor: sanitze handling of "Debug" Option for "dmabuf_capable"
With the appearance of the this new Option the X Server would crash if the
option is not set.
Default dmabuf_capable to off/FALSE for now - a user without knowledge about
this option does not want to enable it until its save.
Fixes: d11d5bb80 ("glamor: Hide new DRI behind Option "Debug" "dmabuf_capable")
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor_egl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index 4a550932a..f82fa519b 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -960,9 +960,13 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd) if (epoxy_has_egl_extension(glamor_egl->display, "EGL_EXT_image_dma_buf_import") && epoxy_has_egl_extension(glamor_egl->display, - "EGL_EXT_image_dma_buf_import_modifiers")) - glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug, - "dmabuf_capable"); + "EGL_EXT_image_dma_buf_import_modifiers")) { + if (xf86Info.debug != NULL) + glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug, + "dmabuf_capable"); + else + glamor_egl->dmabuf_capable = FALSE; + } #endif glamor_egl->saved_free_screen = scrn->FreeScreen; |