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

Commit cacecfb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am:... 

Merge "Stop using invalid URL to prevent unexpected crash" into tm-dev am: 25f2e584 am: e1c11851

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



Change-Id: Id8c39661aa70abd7f64d198aa6b912d73d25b5d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9fd91b7 e1c11851

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.SystemProperties; 
import android.os.UserHandle;

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"));