From 0dca380a142ff2f80af1c17407acfaaefe42f14e Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 5 Nov 2018 21:06:24 +0100 Subject: [PATCH] Do not fail image upload when Exif data is bad. https://github.com/plone/plone.namedfile/issues/68 --- plone/namedfile/file.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plone/namedfile/file.py b/plone/namedfile/file.py index e97db54f..2e42dc09 100644 --- a/plone/namedfile/file.py +++ b/plone/namedfile/file.py @@ -393,8 +393,15 @@ def __init__(self, data=b'', contentType='', filename=None): 'Exif Data: %s', exif_data) orientation = exif_data['0th'].get(piexif.ImageIFD.Orientation, 1) if 1 < orientation <= 8: - self.data, self._width, self._height, self.exif = rotate_image( - self.data) + try: + self.data, self._width, self._height, self.exif = \ + rotate_image(self.data) + except KeyboardInterrupt: + raise + except Exception as e: + log.warning( + 'Error rotating image %s based on exif data.', + filename, exc_info=1) else: self.exif = exif_data