diff options
| author | Dave Airlie <airlied@gmail.com> | 2016-05-30 08:02:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-30 11:30:04 +1000 |
| commit | d98d6e6269167230d20efdc45d608435a52f25fb (patch) | |
| tree | 96c42a12dcab57e3c6b730317a070a4b2b771eb0 | |
| parent | e2791b38b42f83add5b07298c39741bf0a6d7d4b (diff) | |
egl/dri3: don't crash on no context.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94925
Pointed out by Karol Herbst on irc.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11_dri3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c index 8e4a131b11..9363a8a166 100644 --- a/src/egl/drivers/dri2/platform_x11_dri3.c +++ b/src/egl/drivers/dri2/platform_x11_dri3.c @@ -96,8 +96,10 @@ static __DRIcontext * egl_dri3_get_dri_context(struct loader_dri3_drawable *draw) { _EGLContext *ctx = _eglGetCurrentContext(); - struct dri2_egl_context *dri2_ctx = dri2_egl_context(ctx); - + struct dri2_egl_context *dri2_ctx; + if (!ctx) + return NULL; + dri2_ctx = dri2_egl_context(ctx); return dri2_ctx->dri_context; } |