python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-06-29 17:33:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3061 from kathryndavies/master

Browse Source 
Fix a resource leak: close fp before return
This commit is contained in:
wiredfool 2018-04-02 10:51:14 +01:00 committed by GitHub
commit 8cc9713bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tests/test_image.py
View File

@ -112,7 +112,6 @@ class TestImage(PillowTestCase):
self.assertRaises(ValueError, im.save, temp_file) self.assertRaises(ValueError, im.save, temp_file)
def test_internals(self): def test_internals(self):
im = Image.new("L", (100, 100)) im = Image.new("L", (100, 100))
im.readonly = 1 im.readonly = 1
im._copy() im._copy()
@ -122,8 +121,15 @@ class TestImage(PillowTestCase):
im.paste(0, (0, 0, 100, 100)) im.paste(0, (0, 0, 100, 100))
self.assertFalse(im.readonly) self.assertFalse(im.readonly)
test_file = self.tempfile("temp.ppm") def test_dump(self):
im._dump(test_file) 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): def test_comparison_with_other_type(self):
# Arrange # Arrange

1
src/libImaging/File.c
View File

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