Issue #12411: Fix to cgi.parse_multipart to correctly use bytes boundaries and
bytes data. Patch by Jonas Wagner.
diff --git a/Lib/cgi.py b/Lib/cgi.py
index 90a3345..ad6b1f8 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -214,17 +214,17 @@
"""
import http.client
- boundary = ""
+ boundary = b""
if 'boundary' in pdict:
boundary = pdict['boundary']
if not valid_boundary(boundary):
raise ValueError('Invalid boundary in multipart form: %r'
% (boundary,))
- nextpart = "--" + boundary
- lastpart = "--" + boundary + "--"
+ nextpart = b"--" + boundary
+ lastpart = b"--" + boundary + b"--"
partdict = {}
- terminator = ""
+ terminator = b""
while terminator != lastpart:
bytes = -1
@@ -243,7 +243,7 @@
raise ValueError('Maximum content length exceeded')
data = fp.read(bytes)
else:
- data = ""
+ data = b""
# Read lines until end of part.
lines = []
while 1:
@@ -251,7 +251,7 @@
if not line:
terminator = lastpart # End outer loop
break
- if line.startswith("--"):
+ if line.startswith(b"--"):
terminator = line.rstrip()
if terminator in (nextpart, lastpart):
break
@@ -263,12 +263,12 @@
if lines:
# Strip final line terminator
line = lines[-1]
- if line[-2:] == "\r\n":
+ if line[-2:] == b"\r\n":
line = line[:-2]
- elif line[-1:] == "\n":
+ elif line[-1:] == b"\n":
line = line[:-1]
lines[-1] = line
- data = "".join(lines)
+ data = b"".join(lines)
line = headers['content-disposition']
if not line:
continue