fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / bookctrl.cpp

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 3b1bfc6d1c8fe2d64670b7542ffeeda71d7d1e35..9f0e284652550a55169d1529220b9825783bb5ee 100644 (file)
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -109,21 +109,17 @@ wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const
     if ( !m_bookctrl || !m_bookctrl->IsShown() )
         return sizePage;
 
+    // Notice that the controller size is its current size while we really want
+    // to have its best size. So we only take into account its size in the
+    // direction in which we should add it but not in the other one, where the
+    // controller size is determined by the size of wxBookCtrl itself.
     const wxSize sizeController = GetControllerSize();
 
     wxSize size = sizePage;
     if ( IsVertical() )
-    {
-        if ( sizeController.x > sizePage.x )
-            size.x = sizeController.x;
         size.y += sizeController.y + GetInternalBorder();
-    }
     else // left/right aligned
-    {
         size.x += sizeController.x + GetInternalBorder();
-        if ( sizeController.y > sizePage.y )
-            size.y = sizeController.y;
-    }
 
     return size;
 }
@@ -148,16 +144,8 @@ wxSize wxBookCtrlBase::DoGetBestSize() const
         for ( size_t nPage = 0; nPage < nCount; nPage++ )
         {
             const wxWindow * const pPage = m_pages[nPage];
-            if( pPage )
-            {
-                wxSize childBestSize(pPage->GetBestSize());
-
-                if ( childBestSize.x > bestSize.x )
-                    bestSize.x = childBestSize.x;
-
-                if ( childBestSize.y > bestSize.y )
-                    bestSize.y = childBestSize.y;
-            }
+            if ( pPage )
+                bestSize.IncTo(pPage->GetBestSize());
         }
     }