[Mesa-dev] [PATCH mesa] i965: Check result of make_surface() for miptree_create

Nanley Chery nanleychery at gmail.com
Thu May 17 21:42:58 UTC 2018


On Thu, May 17, 2018 at 01:05:13PM +0100, Eric Engestrom wrote:
> From: Andrea Azzarone <azzaronea at gmail.com>
> 
> Since make_surface() can fail we need to check the result before dereferencing it.
> 

This line should be wrapped to 75 characters or less
(see https://www.mesa3d.org/submittingpatches.html).

> Bug: https://github.com/mesa3d/mesa/pull/5
> Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1760415

I'd also add

Fixes: 67b53ee4183 "i965: Represent depth surfaces with isl"

With those changes, this patch is
Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>

> Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
> ---
> Andrea: We don't use github, I only happened to notice your pull request :)
>         Next time you want to send us something, send it here :P
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 67086ee6c0e8d6b6feb0..43687ea77abfe9989882 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -718,6 +718,9 @@ miptree_create(struct brw_context *brw,
>           ISL_SURF_USAGE_DEPTH_BIT | ISL_SURF_USAGE_TEXTURE_BIT,
>           BO_ALLOC_BUSY, 0, NULL);
>  
> +      if (!mt)
> +         return NULL;
> +
>        if (needs_separate_stencil(brw, mt, format) &&
>            !make_separate_stencil_surface(brw, mt)) {
>           intel_miptree_release(&mt);
> -- 
> Cheers,
>   Eric
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list