Skip to content

Add except to catch small int overflow #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions adafruit_framebuf.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,17 @@ def __init__(self, font_name='font5x8.bin'):
# 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."""
Expand Down