Skip to content

Commit d0344c1

Browse files
authored
Keep only the incomplete escape when quoted-printable data is split (#355)
1 parent 44871df commit d0344c1

2 files changed

Lines changed: 14 additions & 5 deletions

File tree

‎python_multipart/decoders.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ def write(self, data: bytes) -> int:
139139
if len(self.cache) > 0:
140140
data = self.cache + data
141141

142-
# If the last 2 characters have an '=' sign in it, then we won't be
143-
# able to decode the encoded value and we'll need to save it for the
144-
# next decoding step.
145-
if data[-2:].find(b"=") != -1:
146-
enc, rest = data[:-2], data[-2:]
142+
# An '=' in the last 2 characters may start an incomplete escape, so we
143+
# keep everything from it onwards for the next decoding step.
144+
idx = data.find(b"=", max(0, len(data) - 2))
145+
if idx != -1:
146+
enc, rest = data[:idx], data[idx:]
147147
else:
148148
enc = data
149149
rest = b""

‎tests/test_multipart.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,15 @@ def test_with_split_newline_escape_2(self) -> None:
753753
self.d.write(b"\r\nbar")
754754
self.assert_data(b"foobar")
755755

756+
def test_with_escape_before_split_escape(self) -> None:
757+
self.d.write(b"=41=")
758+
self.d.write(b"42")
759+
self.assert_data(b"AB")
760+
761+
def test_with_trailing_double_equals(self) -> None:
762+
self.d.write(b"==")
763+
self.assert_data(b"=")
764+
756765
def test_close_and_finalize(self) -> None:
757766
parser = Mock()
758767
f = QuotedPrintableDecoder(parser)

0 commit comments

Comments
 (0)