Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc162dd7 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Stop using invalid URL to prevent unexpected crash" into sc-dev

parents e86cdf4b fe57c5bf

services/core/java/com/android/server/connectivity/PacProxyService.java

+17 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;

import android.webkit.URLUtil;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.TrafficStatsConstants;
@@ -232,8 +233,22 @@ public class PacProxyService extends IPacProxyManager.Stub { 
     * @throws IOException if the URL is malformed, or the PAC file is too big.

     */

    private static String get(Uri pacUri) throws IOException {

        URL url = new URL(pacUri.toString());

        URLConnection urlConnection = url.openConnection(java.net.Proxy.NO_PROXY);

        if (!URLUtil.isValidUrl(pacUri.toString()))  {

            throw new IOException("Malformed URL:" + pacUri);

        }



        final URL url = new URL(pacUri.toString());

        URLConnection urlConnection;

        try {

            urlConnection = url.openConnection(java.net.Proxy.NO_PROXY);

            // Catch the possible exceptions and rethrow as IOException to not to crash the system

            // for illegal input.

        } catch (IllegalArgumentException e) {

            throw new IOException("Incorrect proxy type for " + pacUri);

        } catch (UnsupportedOperationException e) {

            throw new IOException("Unsupported URL connection type for " + pacUri);

        }



        long contentLength = -1;

        try {

            contentLength = Long.parseLong(urlConnection.getHeaderField("Content-Length"));