lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-18 21:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another case with not enough column data and protect against crashes

Browse Source
This commit is contained in:
baldurk
2017-11-17 17:06:51 +00:00
parent b118664bc2
commit e790555914
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Widgets/Extended/RDTreeWidget.cpp
+8 -4
View File
@@ -706,7 +706,8 @@ void RDTreeWidgetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
{
RDTreeWidgetItem *item = model->itemForIndex(index);
if(item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
if(index.column() < item->m_text.count() &&
item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
{
{
// draw the item without text, so we get the proper background/selection/etc.
@@ -790,7 +791,8 @@ QSize RDTreeWidgetDelegate::sizeHint(const QStyleOptionViewItem &option, const Q
{
RDTreeWidgetItem *item = model->itemForIndex(index);
if(item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
if(index.column() < item->m_text.count() &&
item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
{
ResourceIdLinkedTextPtr linkedText =
item->m_text[index.column()].value<ResourceIdLinkedTextPtr>();
@@ -818,7 +820,8 @@ bool RDTreeWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
{
RDTreeWidgetItem *item = rdmodel->itemForIndex(index);
if(item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
if(index.column() < item->m_text.count() &&
item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
{
ResourceIdLinkedTextPtr linkedText =
item->m_text[index.column()].value<ResourceIdLinkedTextPtr>();
@@ -877,7 +880,8 @@ bool RDTreeWidgetDelegate::linkHover(QMouseEvent *e, const QModelIndex &index)
{
RDTreeWidgetItem *item = m_widget->m_model->itemForIndex(index);
if(item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
if(index.column() < item->m_text.count() &&
item->m_text[index.column()].userType() == qMetaTypeId<ResourceIdLinkedTextPtr>())
{
ResourceIdLinkedTextPtr linkedText =
item->m_text[index.column()].value<ResourceIdLinkedTextPtr>();
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+2 -2
View File
@@ -1486,8 +1486,8 @@ void VulkanPipelineStateViewer::setState()
if(showNode(usedSlot, filledSlot))
{
RDTreeWidgetItem *node =
new RDTreeWidgetItem({i, name, a.location, a.binding, a.format.Name(), a.byteoffset});
RDTreeWidgetItem *node = new RDTreeWidgetItem(
{i, name, a.location, a.binding, a.format.Name(), a.byteoffset, QString()});
usedBindings[a.binding] = true;