From: Marek Olšák <marek.olsak@amd.com>
Date: Mon, 30 May 2016 14:29:18 +0000 (+0200)
Subject: mesa: fix crash in driver_RenderTexture_is_safe
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a10192b4b2435577bde1227c06166029b581398;p=mesa.git

mesa: fix crash in driver_RenderTexture_is_safe

This just fixed the crash with the apitrace in bug report.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95246

Cc: 11.1 11.2 12.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index fa5baa3517b..bf47c1cf365 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -389,7 +389,8 @@ driver_RenderTexture_is_safe(const struct gl_renderbuffer_attachment *att)
    const struct gl_texture_image *const texImage =
       att->Texture->Image[att->CubeMapFace][att->TextureLevel];
 
-   if (texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
+   if (!texImage ||
+       texImage->Width == 0 || texImage->Height == 0 || texImage->Depth == 0)
       return false;
 
    if ((texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY