jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 16:08:23 +08:00
Code Issues Projects Releases Wiki Activity

Removed checks for NULL before calling delete or free

Browse Source
This commit is contained in:
Nikolaj Schlej 2016-04-09 13:18:10 +02:00
parent 80a2d57f62
commit ba0779b415
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
UEFITool/uefitool.cpp
View File

@ -130,17 +130,14 @@ void UEFITool::init()
ui->actionMessagesCopyAll->setDisabled(true); ui->actionMessagesCopyAll->setDisabled(true);
// Create new model ... // Create new model ...
if (model) delete model;
delete model; model = new TreeModel();
model = new TreeModel();
ui->structureTreeView->setModel(model); ui->structureTreeView->setModel(model);
// ... and ffsParser // ... and ffsParser
if (ffsParser) delete ffsParser;
delete ffsParser;
ffsParser = new FfsParser(model); ffsParser = new FfsParser(model);
// ... and fitParser // ... and fitParser
if (fitParser) delete fitParser;
delete fitParser;
fitParser = new FitParser(model); fitParser = new FitParser(model);
// Connect // Connect
@ -678,8 +675,7 @@ void UEFITool::saveImageFile()
QByteArray reconstructed; QByteArray reconstructed;
// Create ffsBuilder // Create ffsBuilder
if (!ffsBuilder) delete ffsBuilder;
delete ffsBuilder;
ffsBuilder = new FfsBuilder(model); ffsBuilder = new FfsBuilder(model);
STATUS result = ffsBuilder->build(model->index(0,0), reconstructed); STATUS result = ffsBuilder->build(model->index(0,0), reconstructed);
showBuilderMessages(); showBuilderMessages();
@ -759,13 +755,11 @@ void UEFITool::openImageFile(QString path)
} }
// Enable search ... // Enable search ...
if (ffsFinder) delete ffsFinder;
delete ffsFinder;
ffsFinder = new FfsFinder(model); ffsFinder = new FfsFinder(model);
ui->actionSearch->setEnabled(true); ui->actionSearch->setEnabled(true);
// ... and other operations // ... and other operations
if (ffsOps) delete ffsOps;
delete ffsOps;
ffsOps = new FfsOperations(model); ffsOps = new FfsOperations(model);
// Set current directory // Set current directory

2
common/ffsparser.cpp
View File

@ -3943,7 +3943,7 @@ STATUS FfsParser::parseVssStoreBody(const QModelIndex & index)
QString info; QString info;
// Rename deleted variables // Rename invalid variables
if (isInvalid) { if (isInvalid) {
name = QObject::tr("Invalid"); name = QObject::tr("Invalid");
} }