[Mesa-dev] [PATCH v2] mesa: Close fp on error path.

Ian Romanick idr at freedesktop.org
Wed Jun 29 21:07:23 UTC 2016


This patch is

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

On 06/29/2016 01:33 PM, Matt Turner wrote:
> ---
>  src/mesa/main/dlist.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
> index 3845d2e..9d9e319 100644
> --- a/src/mesa/main/dlist.c
> +++ b/src/mesa/main/dlist.c
> @@ -10086,15 +10086,12 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
>  
>     if (!islist(ctx, list)) {
>        fprintf(f, "%u is not a display list ID\n", list);
> -      return;
> +      goto out;
>     }
>  
>     dlist = _mesa_lookup_list(ctx, list);
>     if (!dlist) {
> -      if (fname) {
> -         fclose(f);
> -      }
> -      return;
> +      goto out;
>     }
>  
>     n = dlist->Head;
> @@ -10366,7 +10363,7 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
>                 printf
>                    ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",
>                     opcode, (void *) n);
> -               return;
> +               goto out;
>              }
>              else {
>                 fprintf(f, "command %d, %u operands\n", opcode,
> @@ -10380,6 +10377,7 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
>        }
>     }
>  
> + out:
>     fflush(f);
>     if (fname)
>        fclose(f);
> 



More information about the mesa-dev mailing list