Merge pull request #3061 from kathryndavies/master

Fix a resource leak: close fp before return
python-pillow · Apr 2, 2018 · 8cc9713 · 8cc9713
2 parents f474646 + 8f6be2e
commit 8cc9713
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Tests/test_image.py b/Tests/test_image.py
@@ -112,7 +112,6 @@ def test_unknown_extension(self):
         self.assertRaises(ValueError, im.save, temp_file)
 
     def test_internals(self):
-
         im = Image.new("L", (100, 100))
         im.readonly = 1
         im._copy()
@@ -122,8 +121,15 @@ def test_internals(self):
         im.paste(0, (0, 0, 100, 100))
         self.assertFalse(im.readonly)
 
-        test_file = self.tempfile("temp.ppm")
-        im._dump(test_file)
+    def test_dump(self):
+        im = Image.new("L", (10, 10))
+        im._dump(self.tempfile("temp_L.ppm"))
+
+        im = Image.new("RGB", (10, 10))
+        im._dump(self.tempfile("temp_RGB.ppm"))
+
+        im = Image.new("HSV", (10, 10))
+        self.assertRaises(ValueError, im._dump, self.tempfile("temp_HSV.ppm"))
 
     def test_comparison_with_other_type(self):
         # Arrange

diff --git a/src/libImaging/File.c b/src/libImaging/File.c
@@ -70,6 +70,7 @@ ImagingSavePPM(Imaging im, const char* outfile)
         /* Write "PPM" */
         fprintf(fp, "P6\n%d %d\n255\n", im->xsize, im->ysize);
     } else {
+        fclose(fp);
         (void) ImagingError_ModeError();
         return 0;
     }