archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8293590: Some syntax checks performed by URL.openConnection() could be performed earlier, at URL construction

Browse source 
Reviewed-by: jpai, michaelm
This commit is contained in:
Daniel Fuchs 2022-10-18 14:30:51 +00:00
parent 78fed9d307
commit bd41428a56
4 changed files with 638 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
View file

@ -159,17 +159,15 @@ public class FtpURLConnection extends URLConnection {
}
}
static URL checkURL(URL u) throws IllegalArgumentException {
private static URL checkURL(URL u) throws MalformedURLException {
if (u != null) {
if (u.toExternalForm().indexOf('\n') > -1) {
Exception mfue = new MalformedURLException("Illegal character in URL");
throw new IllegalArgumentException(mfue.getMessage(), mfue);
throw new MalformedURLException("Illegal character in URL");
}
}
String s = IPAddressUtil.checkAuthority(u);
if (s != null) {
Exception mfue = new MalformedURLException(s);
throw new IllegalArgumentException(mfue.getMessage(), mfue);
String errMsg = IPAddressUtil.checkAuthority(u);
if (errMsg != null) {
throw new MalformedURLException(errMsg);
}
return u;
}
@ -179,14 +177,14 @@ public class FtpURLConnection extends URLConnection {
*
* @param url The {@code URL} to retrieve or store.
*/
public FtpURLConnection(URL url) {
public FtpURLConnection(URL url) throws MalformedURLException {
this(url, null);
}
/**
* Same as FtpURLconnection(URL) with a per connection proxy specified
*/
FtpURLConnection(URL url, Proxy p) {
FtpURLConnection(URL url, Proxy p) throws MalformedURLException {
super(checkURL(url));
instProxy = p;
host = url.getHost();