summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorAbhilash Raj <maxking@users.noreply.github.com>2019-07-17 16:44:27 (GMT)
committerBarry Warsaw <barry@python.org>2019-07-17 16:44:27 (GMT)
commita4a994bd3e619cbaff97610a1cee8ffa87c672f5 (patch)
tree6aee3d24c4a984481adf2921c31108635b0857ce /Lib/email
parent82494aa6d947c4a320c09c58fe0f100cdcf7af0b (diff)
downloadcpython-a4a994bd3e619cbaff97610a1cee8ffa87c672f5.zip
cpython-a4a994bd3e619cbaff97610a1cee8ffa87c672f5.tar.gz
cpython-a4a994bd3e619cbaff97610a1cee8ffa87c672f5.tar.bz2
bpo-37461: Fix infinite loop in parsing of specially crafted email headers (GH-14794)
* bpo-37461: Fix infinite loop in parsing of specially crafted email headers. Some crafted email header would cause the get_parameter method to run in an infinite loop causing a DoS attack surface when parsing those headers. This patch fixes that by making sure the DQUOTE character is handled to prevent going into an infinite loop.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/_header_value_parser.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index 37dc764..66b042e 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -2496,6 +2496,9 @@ def get_parameter(value):
while value:
if value[0] in WSP:
token, value = get_fws(value)
+ elif value[0] == '"':
+ token = ValueTerminal('"', 'DQUOTE')
+ value = value[1:]
else:
token, value = get_qcontent(value)
v.append(token)