diff options
| author | kkimlabs@chromium.org <kkimlabs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 22:10:15 +0000 |
|---|---|---|
| committer | kkimlabs@chromium.org <kkimlabs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 22:10:15 +0000 |
| commit | a9ba2ae3365b02fb89e6946de4eb9c2f97c3ea44 (patch) | |
| tree | cc7fd1af185e058c2b6a858327669951317173b3 | |
| parent | d478a1da2a418308b27d87a49c9d8bab24067939 (diff) | |
| download | chromium_src-a9ba2ae3365b02fb89e6946de4eb9c2f97c3ea44.zip chromium_src-a9ba2ae3365b02fb89e6946de4eb9c2f97c3ea44.tar.gz chromium_src-a9ba2ae3365b02fb89e6946de4eb9c2f97c3ea44.tar.bz2 | |
Avoid crash in OnRequestThumbnailForContextNode by not processing null pointer.
BUG=274832
Review URL: https://codereview.chromium.org/26477004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228022 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index d3a7a6e..ab3676d 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -504,8 +504,7 @@ void ChromeRenderViewObserver::OnRequestThumbnailForContextNode( WebNode context_node = render_view()->GetContextMenuNode(); SkBitmap thumbnail; gfx::Size original_size; - CHECK(!context_node.isNull()); - if (context_node.isElementNode()) { + if (!context_node.isNull() && context_node.isElementNode()) { WebKit::WebImage image = context_node.to<WebElement>().imageContents(); original_size = image.size(); thumbnail = Downscale(image, |