Skip to content

Guard sidebar widget container index #8307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
plafosse wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −2
Draft

Guard sidebar widget container index #8307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ui/sidebarcontainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <QtCore/QPointer>
#include <QtWidgets/QWidget>
#include <QtWidgets/QStackedWidget>
#include <QtWidgets/QWidget>
Expand Down Expand Up @@ -85,7 +86,7 @@ class BINARYNINJAUIAPI SidebarWidgetContainer : public QWidget
std::set<SidebarWidgetType*> m_active, m_docked;
std::map<SidebarWidgetType*, SidebarStackedWidget> m_stackedWidgets;
std::map<SplitPaneWidget*,
std::map<ViewFrame*, std::map<QString, std::map<SidebarWidgetType*, SidebarWidgetAndHeader*>>>>
std::map<ViewFrame*, std::map<QString, std::map<SidebarWidgetType*, QPointer<SidebarWidgetAndHeader>>>>>
m_widgets;
std::map<SplitPaneWidget*,
std::map<ViewFrame*, std::map<QString, std::map<SidebarWidgetType*, SidebarContentClassifier*>>>>
Expand All @@ -97,9 +98,11 @@ class BINARYNINJAUIAPI SidebarWidgetContainer : public QWidget
SidebarWidgetType* m_focusedType = nullptr;

SidebarStackedWidget& stackedWidgetForType(SidebarWidgetType* type);
std::vector<SidebarWidgetAndHeader*> widgetsForContext() const;
std::vector<QPointer<SidebarWidgetAndHeader>> widgetsForContext() const;
std::vector<SidebarContentClassifier*> contentClassifiersForContext() const;
void insertWidgetIntoContainer(SidebarWidgetType* type, QStackedWidget* widget);
void trackWidget(SidebarWidgetAndHeader* widget);
void pruneDeadWidgets();
void updateContentsVisibility();

private Q_SLOTS:
Expand Down
1 change: 1 addition & 0 deletions ui/sidebarwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class BINARYNINJAUIAPI SidebarWidgetAndHeader : public QWidget
std::map<QWidget*, SidebarHeader*> m_headerWidgets;
std::set<SidebarWidget*> m_activeWidgets;
QLabel* m_noWidgetLabel = nullptr;
void finishRemovingWidget(SidebarWidget* widget, bool deactivateOnEmpty);

private Q_SLOTS:
void tabChanged(QWidget* widget);
Expand Down