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

[repack] fix incorrect extension object bounds.

This commit is contained in:
Garret Rieger 2022-07-20 18:17:29 +00:00
parent 5babfda3f2
commit d520a6d522
2 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/graph/graph.hh
View File

@ -310,41 +310,6 @@ struct graph_t
} }
} }
/*
void promote_extension_lookups (const hb_set_t& subtable_indices)
{
const OT::GSUBGPOS* gstar = (OT::GSUBGPOS*) root ().obj.head;
unsigned lookup_list_idx = index_for_offset (root_idx (), &(gstar->lookupList));
const OT::LookupList<SmallTypes>* lookupList =
(OT::LookupList<SmallTypes>*) object (lookup_list_idx).head;
for (unsigned i = 0; i < lookupList->len; i++)
{
unsigned lookup_idx = index_for_offset (lookup_list_idx, &(lookupList->arrayZ[i]));
const OT::Lookup* lookup = (OT::Lookup*) object (lookup_idx).head;
// TODO(grieger): use the correct type for GSUB vs GPOS
if (lookup->get_type () == 9) continue; // skip extensions
for (unsigned j = 0; j < lookup->subTable.len; j++)
{
unsigned subtable_idx = index_for_offset (lookup_idx, &(lookup->subTable.arrayZ[j]));
if (subtable_indices.has (subtable_idx))
promote_to_extension (lookup_idx);
}
}
}
void promote_to_extension (unsigned lookup_idx)
{
DEBUG_MSG (SUBSET_REPACK, nullptr, "Promoting %d to extension lookup.", lookup_idx);
// TODO(garretrieger): implement me.
}
*/
unsigned index_for_offset(unsigned node_idx, const void* offset) const unsigned index_for_offset(unsigned node_idx, const void* offset) const
{ {
const auto& node = object (node_idx); const auto& node = object (node_idx);
@ -642,7 +607,6 @@ struct graph_t
{ {
positions_invalid = true; positions_invalid = true;
distance_invalid = true; distance_invalid = true;
parents_invalid = true; // TODO: remove
auto* clone = vertices_.push (); auto* clone = vertices_.push ();
if (vertices_.in_error ()) { if (vertices_.in_error ()) {

9
src/graph/gsubgpos-graph.hh
View File

@ -104,7 +104,7 @@ struct Lookup : public OT::Lookup
unsigned type = lookupType; unsigned type = lookupType;
unsigned extension_size = OT::ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>::static_size; unsigned extension_size = OT::ExtensionFormat1<OT::Layout::GSUB_impl::ExtensionSubst>::static_size;
unsigned start = buffer.length; unsigned start = buffer.length;
unsigned end = start + extension_size - 1; unsigned end = start + extension_size;
if (!buffer.resize (buffer.length + extension_size)) if (!buffer.resize (buffer.length + extension_size))
// TODO: resizing potentially invalidates existing head/tail pointers. // TODO: resizing potentially invalidates existing head/tail pointers.
return false; return false;
@ -115,7 +115,11 @@ struct Lookup : public OT::Lookup
extension->extensionLookupType = type; extension->extensionLookupType = type;
extension->extensionOffset = 0; extension->extensionOffset = 0;
unsigned ext_index = graph.new_node (&buffer[start], &buffer[end]); unsigned type_prime = extension->extensionLookupType;
printf("Assigned type %d to extension\n", type_prime);
unsigned ext_index = graph.new_node (&buffer.arrayZ[start],
&buffer.arrayZ[end]);
if (ext_index == (unsigned) -1) return false; if (ext_index == (unsigned) -1) return false;
auto& lookup_vertex = graph.vertices_[lookup_index]; auto& lookup_vertex = graph.vertices_[lookup_index];
@ -142,6 +146,7 @@ struct Lookup : public OT::Lookup
l->position = 4; l->position = 4;
l->bias = 0; l->bias = 0;
ext_vertex.parents.push (lookup_index);
subtable_vertex.remap_parent (lookup_index, ext_index); subtable_vertex.remap_parent (lookup_index, ext_index);
return true; return true;