diff options
| author | mnaganov <mnaganov@chromium.org> | 2015-09-17 10:05:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 17:06:18 +0000 |
| commit | 08e4a8407ca8678344a550c5cdf0032bab51aa31 (patch) | |
| tree | fd3cc70a3e856236eb76260c7cdbfac498e9987d | |
| parent | 5986dcd1b4fa9c18c7de16753c4097b123000657 (diff) | |
| download | chromium_src-08e4a8407ca8678344a550c5cdf0032bab51aa31.zip chromium_src-08e4a8407ca8678344a550c5cdf0032bab51aa31.tar.gz chromium_src-08e4a8407ca8678344a550c5cdf0032bab51aa31.tar.bz2 | |
[Android WebView] Speculative fix for GrantFileSchemeAccesstoChildProcess crash
Most likely the Java side is trying to call a native method on
an already destroyed object.
BUG=532079
Review URL: https://codereview.chromium.org/1339103003
Cr-Commit-Position: refs/heads/master@{#349430}
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index 827f356..29c1e28 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -1394,6 +1394,8 @@ public class AwContents implements SmartClipProvider, public void loadDataWithBaseURL( String baseUrl, String data, String mimeType, String encoding, String historyUrl) { if (TRACE) Log.d(TAG, "loadDataWithBaseURL=" + baseUrl); + if (isDestroyed()) return; + data = fixupData(data); mimeType = fixupMimeType(mimeType); LoadUrlParams loadUrlParams; |