python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 21:50:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Raise an error for an invalid number of bands in FPX image

Browse Source
This commit is contained in:
Andrew Murray 2020-01-01 16:07:03 +11:00
parent ac4b7082c1
commit 138bd714f5
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/input_bw_five_bands.fpx Normal file
View File

Binary file not shown.

6
Tests/test_file_fpx.py
View File

@ -1,5 +1,7 @@
import unittest import unittest
from PIL import Image
from .helper import PillowTestCase from .helper import PillowTestCase
try: try:
@ -20,3 +22,7 @@ class TestFileFpx(PillowTestCase):
# Test a valid OLE file, but not an FPX file # Test a valid OLE file, but not an FPX file
ole_file = "Tests/images/test-ole-file.doc" ole_file = "Tests/images/test-ole-file.doc"
self.assertRaises(SyntaxError, FpxImagePlugin.FpxImageFile, ole_file) self.assertRaises(SyntaxError, FpxImagePlugin.FpxImageFile, ole_file)
def test_fpx_invalid_number_of_bands(self):
with self.assertRaisesRegex(IOError, "Invalid number of bands"):
Image.open("Tests/images/input_bw_five_bands.fpx")

5
src/PIL/FpxImagePlugin.py
View File

@ -97,7 +97,10 @@ class FpxImageFile(ImageFile.ImageFile):
s = prop[0x2000002 | id] s = prop[0x2000002 | id]
colors = [] colors = []
for i in range(i32(s, 4)): bands = i32(s, 4)
if bands > 4:
raise IOError("Invalid number of bands")
for i in range(bands):
# note: for now, we ignore the "uncalibrated" flag # note: for now, we ignore the "uncalibrated" flag
colors.append(i32(s, 8 + i * 4) & 0x7FFFFFFF) colors.append(i32(s, 8 + i * 4) & 0x7FFFFFFF)