From: Brian Paul <brianp@vmware.com>
Date: Mon, 26 Dec 2011 21:49:57 +0000 (-0700)
Subject: swrast: replace assertion with conditional in _swrast_map_teximage()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=08a81c8697cae18e118437936456aa36f82ceeed;p=mesa.git

swrast: replace assertion with conditional in _swrast_map_teximage()

Just in case we ran out of memory when trying to allocate the texture
memory.
---

diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 76a31eeae73..e31cd62679b 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -189,8 +189,12 @@ _swrast_map_teximage(struct gl_context *ctx,
    stride = _mesa_format_row_stride(texImage->TexFormat, texImage->Width);
    _mesa_get_format_block_size(texImage->TexFormat, &bw, &bh);
 
-   assert(swImage->Buffer);
-
+   if (!swImage->Buffer) {
+      /* probably ran out of memory when allocating tex mem */
+      *mapOut = NULL;
+      return;
+   }
+      
    map = swImage->Buffer;
 
    if (texImage->TexObject->Target == GL_TEXTURE_3D ||