diff options
| author | Mikhail Naganov <mnaganov@chromium.org> | 2016-02-18 15:33:03 -0800 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@chromium.org> | 2016-02-18 23:35:08 +0000 |
| commit | 687da4b00481027145d18c42653202aa4621f9f4 (patch) | |
| tree | 68348cc21d972992f2b8da22302e26bfa5421fbd /content/public | |
| parent | 26f25fd827bf88400f75845f9c0121315e7f138c (diff) | |
| download | chromium_src-687da4b00481027145d18c42653202aa4621f9f4.zip chromium_src-687da4b00481027145d18c42653202aa4621f9f4.tar.gz chromium_src-687da4b00481027145d18c42653202aa4621f9f4.tar.bz2 | |
Check for destroyed WebContents in getUrl
There seem to be crashes in WebContentsAndroid::GetURL probably
caused by a bad native pointer coming from the Java side.
BUG=587281
Review URL: https://codereview.chromium.org/1707503003
Cr-Commit-Position: refs/heads/master@{#375910}
(cherry picked from commit b07e7b329c04c18dda0de66fe48ead648167ddb4)
Review URL: https://codereview.chromium.org/1710103003 .
Cr-Commit-Position: refs/branch-heads/2623@{#443}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java index 04c3745..193db4c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java @@ -290,6 +290,7 @@ import java.util.UUID; @Override public String getUrl() { + if (isDestroyed()) return null; return nativeGetURL(mNativeWebContentsAndroid); } |