Fixed issue #544 - crash in CDockAreaTabBar::currentTab()

githubuser0xFFFF · githubuser0xFFFF · commit 7a362b7ee304 · 2023-08-03T15:57:57.000+02:00
diff --git a/src/DockAreaTabBar.cpp b/src/DockAreaTabBar.cpp
@@ -300,7 +300,7 @@ int CDockAreaTabBar::currentIndex() const
 //===========================================================================
 CDockWidgetTab* CDockAreaTabBar::currentTab() const
 {
-	if (d->CurrentIndex < 0)
+	if (d->CurrentIndex < 0 || d->CurrentIndex >= d->TabsLayout->count())
 	{
 		return nullptr;
 	}

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ int CDockAreaTabBar::currentIndex() const`
`300`	`300`	`//===========================================================================`
`301`	`301`	`CDockWidgetTab* CDockAreaTabBar::currentTab() const`
`302`	`302`	`{`
`303`		`- if (d->CurrentIndex < 0)`
	`303`	`+ if (d->CurrentIndex < 0 \|\| d->CurrentIndex >= d->TabsLayout->count())`
`304`	`304`	`{`
`305`	`305`	`return nullptr;`
`306`	`306`	`}`