Fix CVE-2013-2171 with @jlee-r7 feedback
Land #2023 - Improve CVE-2013-2171