Merge pull request #7594 from radarhere/olefile

Fixed closing file pointer with olefile 0.47
python-pillow · Dec 2, 2023 · 2b5c081 · 2b5c081
2 parents 76446ee + 0e523d9
commit 2b5c081
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py
@@ -227,6 +227,7 @@ def _open_subimage(self, index=1, subimage=0):
                     break  # isn't really required
 
         self.stream = stream
+        self._fp = self.fp
         self.fp = None
 
     def load(self):

diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py
@@ -66,6 +66,7 @@ def _open(self):
         self._n_frames = len(self.images)
         self.is_animated = self._n_frames > 1
 
+        self.__fp = self.fp
         self.seek(0)
 
     def seek(self, frame):
@@ -87,10 +88,12 @@ def tell(self):
         return self.frame
 
     def close(self):
+        self.__fp.close()
         self.ole.close()
         super().close()
 
     def __exit__(self, *args):
+        self.__fp.close()
         self.ole.close()
         super().__exit__()