From 4ac21cd37da3c8ff3ca049312213c090efc154cb Mon Sep 17 00:00:00 2001 From: Sambuddha Basu Date: Thu, 29 Jan 2015 22:54:42 +0530 Subject: [PATCH] Issue 11111 - Division by zero in TabDecorator Signed-off-by: John Scipione --- src/servers/app/decorator/TabDecorator.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/servers/app/decorator/TabDecorator.cpp b/src/servers/app/decorator/TabDecorator.cpp index 0d295a0195..6852ea6aae 100644 --- a/src/servers/app/decorator/TabDecorator.cpp +++ b/src/servers/app/decorator/TabDecorator.cpp @@ -406,13 +406,17 @@ TabDecorator::_DoTabLayout() void TabDecorator::_DistributeTabSize(float delta) { - ASSERT(CountTabs() > 1); + int32 tabCount = fTabList.CountItems(); + ASSERT(tabCount > 1); float maxTabSize = 0; float secMaxTabSize = 0; int32 nTabsWithMaxSize = 0; - for (int32 i = 0; i < fTabList.CountItems(); i++) { + for (int32 i = 0; i < tabCount; i++) { Decorator::Tab* tab = fTabList.ItemAt(i); + if (tab == NULL) + continue; + float tabWidth = tab->tabRect.Width(); if (int_equal(maxTabSize, tabWidth)) { nTabsWithMaxSize++;