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

[CFF2Index] Avoid infinite loop visitor by hiding symbol

Browse Source
This commit is contained in:
Behdad Esfahbod 2023-12-17 13:40:41 -07:00
parent f24808c58c
commit febbb34dba
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/fontTools/ttLib/tables/otConverters.py
View File

@ -1809,8 +1809,8 @@ def cff2_index_read_item(self, i):
self.reader.seek(self.data_pos + offsets[0]) self.reader.seek(self.data_pos + offsets[0])
item = self.reader.readData(offsets[1] - offsets[0]) item = self.reader.readData(offsets[1] - offsets[0])
if self.itemClass is not None: if self._itemClass is not None:
obj = self.itemClass() obj = self._itemClass()
obj.decompile(item, self.font) obj.decompile(item, self.font)
item = obj item = obj
@ -1824,7 +1824,7 @@ class CFF2Index(BaseConverter):
BaseConverter.__init__( BaseConverter.__init__(
self, name, repeat, aux, tableClass, description=description self, name, repeat, aux, tableClass, description=description
) )
self.itemClass = itemClass self._itemClass = itemClass
def read(self, reader, font, tableDict): def read(self, reader, font, tableDict):
count = reader.readULong() count = reader.readULong()
@ -1853,8 +1853,8 @@ class CFF2Index(BaseConverter):
assert lastOffset <= offset assert lastOffset <= offset
item = reader.readData(offset - lastOffset) item = reader.readData(offset - lastOffset)
if self.itemClass is not None: if self._itemClass is not None:
obj = self.itemClass() obj = self._itemClass()
obj.decompile(item, font) obj.decompile(item, font)
item = obj item = obj
@ -1867,7 +1867,7 @@ class CFF2Index(BaseConverter):
l.offset_pos = l.reader.pos l.offset_pos = l.reader.pos
l.data_pos = l.offset_pos + (count + 1) * offSize l.data_pos = l.offset_pos + (count + 1) * offSize
l.font = font l.font = font
l.itemClass = self.itemClass l._itemClass = self._itemClass
l.offSize = offSize l.offSize = offSize
l.readArray = getReadArray(l.reader, offSize) l.readArray = getReadArray(l.reader, offSize)
@ -1882,7 +1882,7 @@ class CFF2Index(BaseConverter):
if not len(items): if not len(items):
return return
if self.itemClass is not None: if self._itemClass is not None:
items = [item.compile(font) for item in items] items = [item.compile(font) for item in items]
offsets = [len(item) for item in items] offsets = [len(item) for item in items]
@ -1912,7 +1912,7 @@ class CFF2Index(BaseConverter):
writer.writeData(item) writer.writeData(item)
def xmlRead(self, attrs, content, font): def xmlRead(self, attrs, content, font):
obj = self.itemClass() obj = self._itemClass()
obj.fromXML(None, attrs, content, font) obj.fromXML(None, attrs, content, font)
return obj return obj