adafruit-mirror/Adafruit_CircuitPython_framebuf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #26 from caternuson/iss25

Browse source 
Add except to catch small int overflow
This commit is contained in:
Carter Nelson 2019-11-02 23:03:02 -07:00 committed by GitHub
commit 97aefe39db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adafruit_framebuf.py
View file

@ -396,13 +396,17 @@ class BitmapFont:
# Note that only fonts up to 8 pixels tall are currently supported.
try:
self._font = open(self.font_name, 'rb')
self.font_width, self.font_height = struct.unpack('BB', self._font.read(2))
# simple font file validation check based on expected file size
if 2 + 256 * self.font_width != os.stat(font_name)[6]:
raise RuntimeError("Invalid font file: " + font_name)
except OSError:
print("Could not find font file", font_name)
raise
self.font_width, self.font_height = struct.unpack('BB', self._font.read(2))
# simple font file validation check based on expected file size
if 2 + 256 * self.font_width != os.stat(font_name)[6]:
raise RuntimeError("Invalid font file: " + font_name)
except OverflowError:
# os.stat can throw this on boards without long int support
# just hope the font file is valid and press on
pass
def deinit(self):
"""Close the font file as cleanup."""