summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 02:48:12 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 02:48:12 +0000
commit0f3dfb420337c569091ac303081c30c9e060f842 (patch)
tree14da3bb5e05326a31817f32f08a0c2c9593683b8 /views
parent67f373ad6b2d8a7557fb2d78e4bdb22aaddbe531 (diff)
downloadchromium_src-0f3dfb420337c569091ac303081c30c9e060f842.zip
chromium_src-0f3dfb420337c569091ac303081c30c9e060f842.tar.gz
chromium_src-0f3dfb420337c569091ac303081c30c9e060f842.tar.bz2
Fix possible null pointer dereference.
CID=6295 BUG=none Review URL: http://codereview.chromium.org/216041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index b2ee503..fa8a2c7 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -135,7 +135,8 @@ View* NativeTabbedPaneWin::RemoveTabAtIndex(int index) {
TabCtrl_DeleteItem(native_view(), index);
// The removed tab may have made the contents window bigger.
- ResizeContents();
+ if (content_window_)
+ ResizeContents();
std::vector<View*>::iterator iter = tab_views_.begin() + index;
View* removed_tab = *iter;