Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo

Browse Source 
Merge commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken

* commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7':
  Fix for 2585858, load invalid urls.
This commit is contained in:
Kristian Monsen
2010-04-14 12:10:53 -07:00
committed by Android Git Automerger
parent 11d60e0b33 a18df1341e
commit d2688cb1de
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/FrameLoader.java
View File

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