philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential crash uncovered by UBSAN

Browse Source 
m_inCtor might be read before being initialized since when
the earlier members are initialized they can call back into
Frame.
This commit is contained in:
Sergio Martins
2021-01-07 11:04:39 +00:00
parent 1aee98bebd
commit 3b1158b82f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/private/Frame_p.h
View File

@@ -282,7 +282,9 @@ protected:
virtual DockWidgetBase *currentDockWidget_impl() const = 0; virtual DockWidgetBase *currentDockWidget_impl() const = 0;
virtual int dockWidgetCount_impl() const = 0; virtual int dockWidgetCount_impl() const = 0;
virtual int nonContentsHeight() const = 0; virtual int nonContentsHeight() const = 0;
private:
bool m_inCtor = true; // Needs to be initialized early, as pointed out by UBSAN
protected:
bool m_inDtor = false; bool m_inDtor = false;
private: private:
Q_DISABLE_COPY(Frame) Q_DISABLE_COPY(Frame)
@@ -291,7 +293,6 @@ private:
void onCurrentTabChanged(int index); void onCurrentTabChanged(int index);
void scheduleDeleteLater(); void scheduleDeleteLater();
bool event(QEvent *) override; bool event(QEvent *) override;
bool m_inCtor = true;
TitleBar *const m_titleBar; TitleBar *const m_titleBar;
DropArea *m_dropArea = nullptr; DropArea *m_dropArea = nullptr;
const FrameOptions m_options; const FrameOptions m_options;