[Mesa-dev] [PATCH] i915: add a missing NULL pointer check

[Ian Romanick]

On 05/27/2014 03:31 AM, Lubomir Rintel wrote:
> mesaVisual can be NULL with configless context since this commit:
> 
>     commit 551d459af421a2eb937e9e16301bb64da4624f89
>     Author: Neil Roberts <neil at linux.intel.com>
>     Date:   Fri Mar 7 18:05:47 2014 +0000
> 
>     Add the EGL_MESA_configless_context extension
> ...
>     Previously the i965 and i915 drivers were explicitly creating a zeroed visual
>     whenever 0 is passed for the EGLConfig.
> 
> We attempt to dereference the visual in i915 and now we don't create a
> zeroed-out one one it crashes, breaking at least weston in an i915. There's
> point in doing so as it would be zero anyway.

I think you mean "There's no point".  Yeah?

> 
> Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
> ---
> This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1100967

This should go in the commit message as

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1100967

This commit should also be tagged for the 10.2 branch:

Cc: "10.2" <mesa-stable at lists.freedesktop.org>

>  src/mesa/drivers/dri/i915/intel_context.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
> index a6057d3..09fe371 100644
> --- a/src/mesa/drivers/dri/i915/intel_context.c
> +++ b/src/mesa/drivers/dri/i915/intel_context.c
> @@ -507,7 +507,7 @@ intelInitContext(struct intel_context *intel,
>  
>     _mesa_meta_init(ctx);
>  
> -   intel->hw_stencil = mesaVis->stencilBits && mesaVis->depthBits == 24;
> +   intel->hw_stencil = mesaVis && mesaVis->stencilBits && mesaVis->depthBits == 24;

Other then the complaints about the commit message, the code chnage
looks good.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

>     intel->hw_stipple = 1;
>  
>     intel->RenderIndex = ~0;