summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 18:41:43 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 18:41:43 +0000
commitb553de8ad8058d912e997ab5182433b7506afce6 (patch)
treea7c586d3537665d0f7ca86e25b84c86ec62bed7c
parent7e1b1849f6c566a9868148a2ce6ec126029088be (diff)
downloadchromium_src-b553de8ad8058d912e997ab5182433b7506afce6.zip
chromium_src-b553de8ad8058d912e997ab5182433b7506afce6.tar.gz
chromium_src-b553de8ad8058d912e997ab5182433b7506afce6.tar.bz2
Fix Crash in KeyPressListenersHandleEvent
Prevent RenderWidgetHostView from calling KeyPressListenersHandleEvent on a NULL member. BUG=118351 TEST=No more crashes in content::RenderWidgetHostImpl::KeyPressListenerHandleEvent Review URL: http://codereview.chromium.org/9702070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126948 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/render_widget_host_view_gtk.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index fa4b879..6e82192 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -213,7 +213,8 @@ class RenderWidgetHostViewGtkWidget {
host_view->is_fullscreen_;
if (should_close_on_escape && GDK_Escape == event->keyval) {
host_view->host_->Shutdown();
- } if (host_view->host_->KeyPressListenersHandleEvent(event)) {
+ } if (host_view->host_ &&
+ host_view->host_->KeyPressListenersHandleEvent(event)) {
return TRUE;
} else {
// Send key event to input method.