[Mesa-dev] [PATCH] st/mesa: add null pointer check in st_texture_image_map()

[Jose Fonseca]

Looks good.

Jose

----- Original Message -----
> If we failed to allocate a memory resource for the texture we'd crash
> when we tried to map it.  Now we propogate the NULL back up to the
> texstore code and generate GL_OUT_OF_MEMORY.
> 
> Fixes a crash with the upcoming piglit max-texture-size test.
> 
> NOTE: This is a candidate for the 8.0 branch.
> ---
>  src/mesa/state_tracker/st_texture.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/src/mesa/state_tracker/st_texture.c
> b/src/mesa/state_tracker/st_texture.c
> index 132d7a8..9627a61 100644
> --- a/src/mesa/state_tracker/st_texture.c
> +++ b/src/mesa/state_tracker/st_texture.c
> @@ -222,6 +222,9 @@ st_texture_image_map(struct st_context *st,
> struct st_texture_image *stImage,
>  
>     DBG("%s \n", __FUNCTION__);
>  
> +   if (!stImage->pt)
> +      return NULL;
> +
>     if (stObj->pt != stImage->pt)
>        level = 0;
>     else
> --
> 1.7.3.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>