shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[subset] Protect against prematurely-short arrays GPOS

Browse Source
This commit is contained in:
Behdad Esfahbod 2016-05-11 14:56:16 +02:00
parent 18e53dbdf5
commit 85750a864a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/fontTools/subset/__init__.py
View File

@ -512,7 +512,9 @@ def subset_glyphs(self, s):
return len(self.Coverage.subset(s.glyphs)) return len(self.Coverage.subset(s.glyphs))
elif self.Format == 2: elif self.Format == 2:
indices = self.Coverage.subset(s.glyphs) indices = self.Coverage.subset(s.glyphs)
self.Value = [self.Value[i] for i in indices] values = self.Value
count = len(values)
self.Value = [values[i] for i in indices if i < count]
self.ValueCount = len(self.Value) self.ValueCount = len(self.Value)
return bool(self.ValueCount) return bool(self.ValueCount)
else: else:
@ -529,7 +531,9 @@ def prune_post_subset(self, options):
def subset_glyphs(self, s): def subset_glyphs(self, s):
if self.Format == 1: if self.Format == 1:
indices = self.Coverage.subset(s.glyphs) indices = self.Coverage.subset(s.glyphs)
self.PairSet = [self.PairSet[i] for i in indices] pairs = self.PairSet
count = len(pairs)
self.PairSet = [pairs[i] for i in indices if i < count]
for p in self.PairSet: for p in self.PairSet:
p.PairValueRecord = [r for r in p.PairValueRecord p.PairValueRecord = [r for r in p.PairValueRecord
if r.SecondGlyph in s.glyphs] if r.SecondGlyph in s.glyphs]