diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 02:18:56 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 02:18:56 +0000 |
| commit | 5dbd7cfee62f2de0131618b763b0c4b1442a9ab7 (patch) | |
| tree | 44c5a739bddaf4b8f0f7cecdfe908fbc13b32acf | |
| parent | ddbcdc48caa88b6405e9da6595895b5ef36a1793 (diff) | |
| download | chromium_src-5dbd7cfee62f2de0131618b763b0c4b1442a9ab7.zip chromium_src-5dbd7cfee62f2de0131618b763b0c4b1442a9ab7.tar.gz chromium_src-5dbd7cfee62f2de0131618b763b0c4b1442a9ab7.tar.bz2 | |
Merge 114357 - Fixing browser crash in extension_browser_event_router.cc.
BUG=107312
TEST=NONE
Review URL: http://codereview.chromium.org/8890070
TBR=dpapad@chromium.org
Review URL: http://codereview.chromium.org/8957003
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@114578 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_browser_event_router.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 66d8321..2cfa328 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -365,8 +365,10 @@ void ExtensionBrowserEventRouter::TabSelectionChanged( for (size_t i = 0; i < new_selection.size(); ++i) { int index = new_selection[i]; - int tab_id = ExtensionTabUtil::GetTabId( - tab_strip_model->GetTabContentsAt(index)->tab_contents()); + TabContentsWrapper* contents = tab_strip_model->GetTabContentsAt(index); + if (!contents) + break; + int tab_id = ExtensionTabUtil::GetTabId(contents->tab_contents()); all->Append(Value::CreateIntegerValue(tab_id)); } |