diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 22:54:26 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 22:54:26 +0000 |
| commit | 670843eb1f9ca058b4849a2a0bc210b96bc103cf (patch) | |
| tree | e6f2028cc4e3ed18b794bb7fd8a9bd1f542f77b7 /views | |
| parent | 2ffd26edd2f8aa430bb02c803b5c93dedc938e11 (diff) | |
| download | chromium_src-670843eb1f9ca058b4849a2a0bc210b96bc103cf.zip chromium_src-670843eb1f9ca058b4849a2a0bc210b96bc103cf.tar.gz chromium_src-670843eb1f9ca058b4849a2a0bc210b96bc103cf.tar.bz2 | |
Fixes possible crash when menus were destroyed. I wasn't resetting a
pointer, leading to bad data write on destruction.
BUG=42513
TEST=see bug
Review URL: http://codereview.chromium.org/2013016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/menu_button.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index b515e17..fe86d7f 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -159,6 +159,8 @@ bool MenuButton::Activate() { return false; } + destroyed_flag_ = NULL; + menu_visible_ = false; menu_closed_time_ = Time::Now(); |