walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[subset] Fix null pointer dereference in hvar/vvar subset (#2085) 

Rest of the code assumes there is at least one subtable, lets return here if not.

* https://crbug.com/oss-fuzz/19827
* https://crbug.com/oss-fuzz/19847
This commit is contained in:
Ebrahim Byagowi 2020-01-06 21:25:00 +03:30 committed by GitHub
parent 8ed27757b1
commit 7950beecfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-var-hvar-table.hh
View File

@ -265,6 +265,8 @@ struct hvarvvar_subset_plan_t
for (unsigned int i = 0; i < inner_maps.length; i++) for (unsigned int i = 0; i < inner_maps.length; i++)
inner_maps[i].init (); inner_maps[i].init ();
if (unlikely (!inner_sets.length || !inner_maps.length)) return;
bool retain_adv_map = false; bool retain_adv_map = false;
index_map_plans[0].init (*index_maps[0], outer_map, inner_sets, plan); index_map_plans[0].init (*index_maps[0], outer_map, inner_sets, plan);
if (index_maps[0] == &Null(DeltaSetIndexMap)) if (index_maps[0] == &Null(DeltaSetIndexMap))

BIN
test/fuzzing/fonts/clusterfuzz-testcase-hb-subset-fuzzer-5641053680173056 Normal file
View File

Binary file not shown.

BIN
test/fuzzing/fonts/clusterfuzz-testcase-minimized-hb-subset-fuzzer-5650879734874112 Normal file
View File

Binary file not shown.