From: Brian Paul <brianp@vmware.com>
Date: Wed, 30 Jun 2010 17:56:56 +0000 (-0600)
Subject: llvmpipe: another null pointer check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb06b543a52c33c10594437ebed2c5e306dc7382;p=mesa.git

llvmpipe: another null pointer check
---

diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index a156bb6517b..1d42bdde4e2 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -1135,7 +1135,7 @@ llvmpipe_get_texture_tile_linear(struct llvmpipe_resource *lpr,
    layout_logic(cur_layout, LP_TEX_LAYOUT_LINEAR, usage,
                 &new_layout, &convert);
 
-   if (convert) {
+   if (convert && tiled_image && linear_image) {
       lp_tiled_to_linear(tiled_image, linear_image,
                          x, y, TILE_SIZE, TILE_SIZE, lpr->base.format,
                          lpr->row_stride[level],