39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 88d9a3994bc244f14d0f594755ac896a235017c5 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Murray <radarhere@users.noreply.github.com>
|
|
Date: Sun, 29 Sep 2019 14:14:38 +1000
|
|
Subject: [PATCH] Added decompression bomb checks
|
|
|
|
Signed-off-by: hanxinke <hanxinke@huawei.com>
|
|
---
|
|
src/PIL/GifImagePlugin.py | 1 +
|
|
src/PIL/IcoImagePlugin.py | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
|
|
index 107c015..70eebf9 100644
|
|
--- a/src/PIL/GifImagePlugin.py
|
|
+++ b/src/PIL/GifImagePlugin.py
|
|
@@ -252,6 +252,7 @@ class GifImageFile(ImageFile.ImageFile):
|
|
self.dispose = None
|
|
elif self.disposal_method == 2:
|
|
# replace with background colour
|
|
+ Image._decompression_bomb_check(self.size)
|
|
self.dispose = Image.core.fill("P", self.size,
|
|
self.info["background"])
|
|
else:
|
|
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
|
|
index 589ef3c..926838d 100644
|
|
--- a/src/PIL/IcoImagePlugin.py
|
|
+++ b/src/PIL/IcoImagePlugin.py
|
|
@@ -167,6 +167,7 @@ class IcoFile(object):
|
|
else:
|
|
# XOR + AND mask bmp frame
|
|
im = BmpImagePlugin.DibImageFile(self.buf)
|
|
+ Image._decompression_bomb_check(im.size)
|
|
|
|
# change tile dimension to only encompass XOR image
|
|
im._size = (im.size[0], int(im.size[1] / 2))
|
|
--
|
|
2.19.1
|
|
|