diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-12 16:42:39 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-04-13 16:48:32 +0100 |
| commit | b2d95503fdb962afa3302dd24dd2b9e3ad4459d6 (patch) | |
| tree | bd7842989bf0660a119ae2a8591744019cb8d5ba /core/java/android/webkit/FrameLoader.java | |
| parent | c58b42327df5fbc826e2fcc2674ab6db0edfcd92 (diff) | |
| download | frameworks_base-b2d95503fdb962afa3302dd24dd2b9e3ad4459d6.zip frameworks_base-b2d95503fdb962afa3302dd24dd2b9e3ad4459d6.tar.gz frameworks_base-b2d95503fdb962afa3302dd24dd2b9e3ad4459d6.tar.bz2 | |
Fix for 2585858, load invalid urls.
The browser currently does not try to load invalid urls, that can be a problem. Now we only check if the host is correctly encoded.
Change-Id: Ie7380c59d4faab68a2f957e7f1ba8347e15e45a1
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
| -rw-r--r-- | core/java/android/webkit/FrameLoader.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java index 906264a..7fd993a 100644 --- a/core/java/android/webkit/FrameLoader.java +++ b/core/java/android/webkit/FrameLoader.java @@ -102,8 +102,9 @@ class FrameLoader { com.android.internal.R.string.httpErrorBadUrl)); return false; } - // Make sure it is correctly URL encoded before sending the request - if (!URLUtil.verifyURLEncoding(url)) { + // Make sure the host part of the url is correctly + // encoded before sending the request + if (!URLUtil.verifyURLEncoding(mListener.host())) { mListener.error(EventHandler.ERROR_BAD_URL, mListener.getContext().getString( com.android.internal.R.string.httpErrorBadUrl)); |