summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2017-05-12 10:49:46 +0100
committerLionel Landwerlin <lionel.g.landwerlin@intel.com>2017-05-15 14:06:11 +0100
commit55be6653e014e48a5c9cb4977c81c1d7d7b037ab (patch)
treea7a81af98b58d95979f4eb6c0ad122f310c8c40d
parent1c8f7d3be6ffb3567041f1e11a037fa7e75e4c28 (diff)
intel: gen-decoder: fix xml parser leak
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@intel.com> Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
-rw-r--r--src/intel/common/gen_decoder.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/gen_decoder.c
index 24147340f5..35aa9f63ff 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);