From 2f2a55a359b4948ea678d67d76a992452cee659c Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 30 Sep 2015 17:28:41 +0200
Subject: [PATCH] Do not assume dev->partitionTable() is not nullptr.
---
src/modules/partition/gui/AlongsidePage.cpp | 3 ++-
src/modules/partition/gui/ChoicePage.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/partition/gui/AlongsidePage.cpp b/src/modules/partition/gui/AlongsidePage.cpp
index 754e7d1556..cf629e3e3c 100644
--- a/src/modules/partition/gui/AlongsidePage.cpp
+++ b/src/modules/partition/gui/AlongsidePage.cpp
@@ -134,7 +134,8 @@ AlongsidePage::init( PartitionCoreModule* core , const OsproberEntryList& osprob
const QModelIndex& deviceIndex = m_core->deviceModel()->index( row );
Device* dev = m_core->deviceModel()->deviceForIndex( deviceIndex );
- if ( ( dev->partitionTable()->type() == PartitionTable::msdos ||
+ if ( dev->partitionTable() &&
+ ( dev->partitionTable()->type() == PartitionTable::msdos ||
dev->partitionTable()->type() == PartitionTable::msdos_sectorbased ) &&
dev->partitionTable()->numPrimaries() == dev->partitionTable()->maxPrimaries() )
{
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 28d815bb2d..c54646a105 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -122,7 +122,8 @@ ChoicePage::init( PartitionCoreModule* core, const OsproberEntryList& osproberEn
const QModelIndex& deviceIndex = m_core->deviceModel()->index( row );
Device* dev = m_core->deviceModel()->deviceForIndex( deviceIndex );
- if ( ( dev->partitionTable()->type() == PartitionTable::msdos ||
+ if ( dev->partitionTable() &&
+ ( dev->partitionTable()->type() == PartitionTable::msdos ||
dev->partitionTable()->type() == PartitionTable::msdos_sectorbased ) &&
dev->partitionTable()->numPrimaries() == dev->partitionTable()->maxPrimaries() )
{
--
GitLab