diff options
author | Yi Kong <yikong@google.com> | 2017-01-19 11:28:29 +0100 |
---|---|---|
committer | Yi Kong <yikong@google.com> | 2017-02-09 11:11:58 +0000 |
commit | 7247f6a70e89efb4696aaaffaf7a0325604a6e06 (patch) | |
tree | ffd8bb6914dca88615182daa7a83a95638ab4191 /annotations/generate_annotated_java_files.py | |
parent | 7654a2ae01d03e1dc458ba1019dc7a264e251610 (diff) |
Pull upstream fix for CVE-2016-5552
to replace our local change that is essentially equivalent logic.
The upstream fix additionally fixes a flaw which if there is more
than one @ in the authority portion, then user and host are set to null
(ignored as malformed).
Upstream change:
Merge
http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/1e8c18ddcab1
Test: libcore.java.net.URLTest#testMultipleUserField
Test: CtsLibcoreTestCases
Bug: 33351987
Change-Id: If5ab229f951c872aecb34834f0a52153f3f0fa26
(cherry picked from commit 2e3689a5019e781fb361cc67982926beaaa969c2)
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions