AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/gen_decoder: Fix parsing of small genxml file.

Browse Source 
When using gen_spec_load_from path, only abort decoding if the read
length is 0. Previously, we were aborting if finding an EOF, even if
something was read from the file.

Also only kill the decoded file if no commands or structs were found,
and print a message in such case.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Rafael Antognolli
2019-07-16 10:00:18 -07:00
parent 85996567f5
commit 1f2b22a6bd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/common/gen_decoder.c
View File

@@ -697,7 +697,7 @@ gen_spec_load_from_path(const struct gen_device_info *devinfo,
gen_spec_destroy(ctx.spec);
ctx.spec = NULL;
goto end;
} else if (feof(input))
} else if (len == 0 && feof(input))
goto end;
if (XML_ParseBuffer(ctx.parser, len, len == 0) == 0) {
@@ -719,7 +719,11 @@ gen_spec_load_from_path(const struct gen_device_info *devinfo,
free(filename);
/* free ctx.spec if genxml is empty */
if (ctx.spec && _mesa_hash_table_num_entries(ctx.spec->commands) == 0) {
if (ctx.spec &&
_mesa_hash_table_num_entries(ctx.spec->commands) == 0 &&
_mesa_hash_table_num_entries(ctx.spec->structs) == 0) {
fprintf(stderr,
"Error parsing XML: empty spec.\n");
gen_spec_destroy(ctx.spec);
return NULL;
}