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

Tighten check for ASCII in previous commit

Browse Source
This commit is contained in:
Behdad Esfahbod 2015-04-22 01:59:50 -07:00
parent 7e4092aba8
commit 2d443eeac2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/fontTools/ttLib/tables/_n_a_m_e.py
View File

@ -146,9 +146,9 @@ class NameRecord(object):
# (Yes, I've seen all of these in the wild... sigh) # (Yes, I've seen all of these in the wild... sigh)
if byteord(string[-1]) == 0: if byteord(string[-1]) == 0:
string = string[:-1] string = string[:-1]
elif all(byteord(b) == 0 if i % 2 else byteord(b) >= 0x20 for i,b in enumerate(string)): elif all(byteord(b) == 0 if i % 2 else byteord(b) >= 0x20 and byteord(b) <= 0x7E for i,b in enumerate(string)):
string = b'\0' + string string = b'\0' + string
elif byteord(string[0]) == 0 and all(byteord(b) >= 0x20 for b in string[1:]): elif byteord(string[0]) == 0 and all(byteord(b) >= 0x20 and byteord(b) <= 0x7E for b in string[1:]):
string = bytesjoin(b'\0'+bytechr(byteord(b)) for b in string[1:]) string = bytesjoin(b'\0'+bytechr(byteord(b)) for b in string[1:])
return tounicode(string, encoding=encoding, errors=errors) return tounicode(string, encoding=encoding, errors=errors)