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

Commit 3b807215 authored by Chiachang Wang's avatar Chiachang Wang Committed by Presubmit Automerger Backend
Browse files

[automerge] Stop using invalid URL to prevent unexpected crash 2p: fe57c5bf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18714947

Bug: 219498290
Change-Id: I6e8722d2c342bfa03544fe7571fd048c85f1a8cd
Merged-In: I22903414380b62051f514e43b93af992f45740b4
parents 718d5a4d 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"));