ed67fe
From 8ad7b436649c424e22689a8a874c1b0cd7c1c0fc Mon Sep 17 00:00:00 2001
ed67fe
From: Lumir Balhar <lbalhar@redhat.com>
ed67fe
Date: Mon, 14 Jun 2021 09:22:45 +0200
ed67fe
Subject: [PATCH 3/5] CVE-2021-28677
ed67fe
ed67fe
---
ed67fe
 src/PIL/EpsImagePlugin.py | 8 ++++----
ed67fe
 1 file changed, 4 insertions(+), 4 deletions(-)
ed67fe
ed67fe
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
ed67fe
index b503487..5f5af15 100644
ed67fe
--- a/src/PIL/EpsImagePlugin.py
ed67fe
+++ b/src/PIL/EpsImagePlugin.py
ed67fe
@@ -167,12 +167,12 @@ class PSFile(object):
ed67fe
         self.fp.seek(offset, whence)
ed67fe
 
ed67fe
     def readline(self):
ed67fe
-        s = self.char or b""
ed67fe
+        s = [self.char or b""]
ed67fe
         self.char = None
ed67fe
 
ed67fe
         c = self.fp.read(1)
ed67fe
-        while c not in b"\r\n":
ed67fe
-            s = s + c
ed67fe
+        while (c not in b"\r\n") and len(c):
ed67fe
+            s.append(c)
ed67fe
             c = self.fp.read(1)
ed67fe
 
ed67fe
         self.char = self.fp.read(1)
ed67fe
@@ -180,7 +180,7 @@ class PSFile(object):
ed67fe
         if self.char in b"\r\n":
ed67fe
             self.char = None
ed67fe
 
ed67fe
-        return s.decode('latin-1')
ed67fe
+        return b"".join(s).decode("latin-1")
ed67fe
 
ed67fe
 
ed67fe
 def _accept(prefix):
ed67fe
-- 
ed67fe
2.31.1
ed67fe