summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/render_widget_host.cc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 00:21:40 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 00:21:40 +0000
commit10519fde25eb61bdd4e3c5e21e99c6416e68d4ed (patch)
tree970c8364d80ba22b5723eb9ae6bff9811dd65da6 /chrome/browser/renderer_host/render_widget_host.cc
parente92475f94e575bbfb63a7b50164eb5e6177583a0 (diff)
downloadchromium_src-10519fde25eb61bdd4e3c5e21e99c6416e68d4ed.zip
chromium_src-10519fde25eb61bdd4e3c5e21e99c6416e68d4ed.tar.gz
chromium_src-10519fde25eb61bdd4e3c5e21e99c6416e68d4ed.tar.bz2
Fix crash introduced in r10563 where we modified a RenderWidgetHost after it had been deallocated.
Review URL: http://codereview.chromium.org/27363 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_widget_host.cc')
-rw-r--r--chrome/browser/renderer_host/render_widget_host.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index f75d2e6..1050ec7 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -575,11 +575,16 @@ void RenderWidgetHost::OnMsgInputEventAck(const IPC::Message& message) {
r = message.ReadBool(&iter, &processed);
DCHECK(r);
+ KeyQueue::value_type front_item = key_queue_.front();
+ key_queue_.pop();
+
if (!processed) {
- UnhandledKeyboardEvent(key_queue_.front());
- }
+ UnhandledKeyboardEvent(front_item);
- key_queue_.pop();
+ // WARNING: This RenderWidgetHost can be deallocated at this point
+ // (i.e. in the case of Ctrl+W, where the call to
+ // UnhandledKeyboardEvent destroys this RenderWidgetHost).
+ }
}
}
}