[Mesa-dev] [PATCH 1/2] intel: gen-decoder: fix xml parser leak

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 05/12/2017 02:37 PM, Lionel Landwerlin wrote:
> In the unlikely case the parsing of genxml files fails, we were
> leaking an xml parser object.
> 
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
> ---
>   src/intel/common/gen_decoder.c | 13 +++++++------
>   1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
> index 24147340f58..35aa9f63ffa 100644
> --- a/src/intel/common/gen_decoder.c
> +++ b/src/intel/common/gen_decoder.c
> @@ -650,9 +650,9 @@ gen_spec_load_from_path(const struct gen_device_info *devinfo,
>         len = fread(buf, 1, XML_BUFFER_SIZE, input);
>         if (len == 0) {
>            fprintf(stderr, "fread: %m\n");
> -         fclose(input);
> -         free(filename);
> -         return NULL;
> +         free(ctx.spec);
> +         ctx.spec = NULL;
> +         goto end;
>         }
>         if (XML_ParseBuffer(ctx.parser, len, len == 0) == 0) {
>            fprintf(stderr,
> @@ -660,12 +660,13 @@ gen_spec_load_from_path(const struct gen_device_info *devinfo,
>                    XML_GetCurrentLineNumber(ctx.parser),
>                    XML_GetCurrentColumnNumber(ctx.parser),
>                    XML_ErrorString(XML_GetErrorCode(ctx.parser)));
> -         fclose(input);
> -         free(filename);
> -         return NULL;
> +         free(ctx.spec);
> +         ctx.spec = NULL;
> +         goto end;
>         }
>      } while (len > 0);
>   
> + end:
>      XML_ParserFree(ctx.parser);
>   
>      fclose(input);
>