|
 |
e773f2 |
From 357fef8b4bd076e3a15e7ffc58a475626794c7e3 Mon Sep 17 00:00:00 2001
|
|
|
e773f2 |
From: Lumir Balhar <lbalhar@redhat.com>
|
|
|
e773f2 |
Date: Fri, 9 Apr 2021 19:41:58 +0200
|
|
|
e773f2 |
Subject: [PATCH 4/4] CVE-2021-27921_27922_27923
|
|
|
e773f2 |
|
|
|
e773f2 |
---
|
|
|
e773f2 |
src/PIL/BlpImagePlugin.py | 1 +
|
|
|
e773f2 |
src/PIL/IcnsImagePlugin.py | 2 ++
|
|
|
e773f2 |
src/PIL/IcoImagePlugin.py | 1 +
|
|
|
e773f2 |
3 files changed, 4 insertions(+)
|
|
|
e773f2 |
|
|
|
e773f2 |
diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py
|
|
|
e773f2 |
index ec358db..d56d46c 100644
|
|
|
e773f2 |
--- a/src/PIL/BlpImagePlugin.py
|
|
|
e773f2 |
+++ b/src/PIL/BlpImagePlugin.py
|
|
|
e773f2 |
@@ -362,6 +362,7 @@ class BLP1Decoder(_BLPBaseDecoder):
|
|
|
e773f2 |
data = jpeg_header + data
|
|
|
e773f2 |
data = BytesIO(data)
|
|
|
e773f2 |
image = JpegImageFile(data)
|
|
|
e773f2 |
+ Image._decompression_bomb_check(image.size)
|
|
|
e773f2 |
self.tile = image.tile # :/
|
|
|
e773f2 |
self.fd = image.fp
|
|
|
e773f2 |
self.mode = image.mode
|
|
|
e773f2 |
diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
|
|
|
e773f2 |
index b382a73..2292584 100644
|
|
|
e773f2 |
--- a/src/PIL/IcnsImagePlugin.py
|
|
|
e773f2 |
+++ b/src/PIL/IcnsImagePlugin.py
|
|
|
e773f2 |
@@ -110,6 +110,7 @@ def read_png_or_jpeg2000(fobj, start_length, size):
|
|
|
e773f2 |
if sig[:8] == b'\x89PNG\x0d\x0a\x1a\x0a':
|
|
|
e773f2 |
fobj.seek(start)
|
|
|
e773f2 |
im = PngImagePlugin.PngImageFile(fobj)
|
|
|
e773f2 |
+ Image._decompression_bomb_check(im.size)
|
|
|
e773f2 |
return {"RGBA": im}
|
|
|
e773f2 |
elif sig[:4] == b'\xff\x4f\xff\x51' \
|
|
|
e773f2 |
or sig[:4] == b'\x0d\x0a\x87\x0a' \
|
|
|
e773f2 |
@@ -122,6 +123,7 @@ def read_png_or_jpeg2000(fobj, start_length, size):
|
|
|
e773f2 |
jp2kstream = fobj.read(length)
|
|
|
e773f2 |
f = io.BytesIO(jp2kstream)
|
|
|
e773f2 |
im = Jpeg2KImagePlugin.Jpeg2KImageFile(f)
|
|
|
e773f2 |
+ Image._decompression_bomb_check(im.size)
|
|
|
e773f2 |
if im.mode != 'RGBA':
|
|
|
e773f2 |
im = im.convert('RGBA')
|
|
|
e773f2 |
return {"RGBA": im}
|
|
|
e773f2 |
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
|
|
|
e773f2 |
index 2b6d1e0..30412ad 100644
|
|
|
e773f2 |
--- a/src/PIL/IcoImagePlugin.py
|
|
|
e773f2 |
+++ b/src/PIL/IcoImagePlugin.py
|
|
|
e773f2 |
@@ -164,6 +164,7 @@ class IcoFile(object):
|
|
|
e773f2 |
if data[:8] == PngImagePlugin._MAGIC:
|
|
|
e773f2 |
# png frame
|
|
|
e773f2 |
im = PngImagePlugin.PngImageFile(self.buf)
|
|
|
e773f2 |
+ Image._decompression_bomb_check(im.size)
|
|
|
e773f2 |
else:
|
|
|
e773f2 |
# XOR + AND mask bmp frame
|
|
|
e773f2 |
im = BmpImagePlugin.DibImageFile(self.buf)
|
|
|
e773f2 |
--
|
|
|
e773f2 |
2.30.2
|
|
|
e773f2 |
|