3.2 - Fix closes Issue12529 - cgi.parse_header failure on double quotes and

semicolons. Patch by Ben Darnell and Petri Lehtinen.

diff --git a/Lib/cgi.py b/Lib/cgi.py
index e198ed8653f20db60370f94f7fe439f76cf0efc8..90a33450bc07cdf7dde6049608912603969e279d 100755 (executable)
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -291,7 +291,7 @@ def _parseparam(s):
     while s[:1] == ';':
         s = s[1:]
         end = s.find(';')
-        while end > 0 and s.count('"', 0, end) % 2:
+        while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2:
             end = s.find(';', end + 1)
         if end < 0:
             end = len(s)

diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index c42db4e70d989004e3be636e3133f2099a8f194f..9951e93f6eef7c8cb1d57f7ab13068b2d4233a9d 100644 (file)
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -348,6 +348,10 @@ this is the content of the fake file
         self.assertEqual(
             cgi.parse_header('attachment; filename="strange;name";size=123;'),
             ("attachment", {"filename": "strange;name", "size": "123"}))
+        self.assertEqual(
+            cgi.parse_header('form-data; name="files"; filename="fo\\"o;bar"'),
+            ("form-data", {"name": "files", "filename": 'fo"o;bar'}))
+
 
 BOUNDARY = "---------------------------721837373350705526688164684"