From f9fef43a9ae2e44fe87c83c1eea1151c9fda89a8 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Sat, 8 Aug 2015 19:09:01 -0400
Subject: [PATCH] Fix to properly free memory that was allocated.

---
 dbchandler.cpp  |  8 ++++++++
 framefileio.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 mainwindow.cpp  |  3 +++
 3 files changed, 51 insertions(+)

diff --git a/dbchandler.cpp b/dbchandler.cpp
index 3fbe60e..0c1dc71 100644
--- a/dbchandler.cpp
+++ b/dbchandler.cpp
@@ -20,7 +20,10 @@ void DBCHandler::loadDBCFile(QString filename)
     qDebug() << "DBC File: " << filename;
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return;
+    }
 
     qDebug() << "Starting DBC load";
     dbc_nodes.clear();
@@ -256,6 +259,7 @@ void DBCHandler::loadDBCFile(QString filename)
 */
     }
     inFile->close();
+    delete inFile;
 }
 
 /*Yes, this is really hard to follow and all of the sections are mixed up in code
@@ -267,7 +271,10 @@ void DBCHandler::saveDBCFile(QString filename)
     QString nodesOutput, msgOutput, commentsOutput, valuesOutput;
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return;
+    }
 
     //right now it outputs a standard hard coded boilerplate
     outFile->write("VERSION \"\"\n");
@@ -386,6 +393,7 @@ void DBCHandler::saveDBCFile(QString filename)
     outFile->write(valuesOutput.toUtf8());
 
     outFile->close();
+    delete outFile;
 }
 
 
diff --git a/framefileio.cpp b/framefileio.cpp
index 546aae2..0b4c25d 100644
--- a/framefileio.cpp
+++ b/framefileio.cpp
@@ -71,7 +71,10 @@ bool FrameFileIO::loadCRTDFile(QString filename, QVector<CANFrame>* frames)
     QByteArray line;
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return false;
+    }
 
     line = inFile->readLine(); //read out the header first and discard it.
 
@@ -114,6 +117,7 @@ bool FrameFileIO::loadCRTDFile(QString filename, QVector<CANFrame>* frames)
         }
     }
     inFile->close();
+    delete inFile;
     return true;
 }
 
@@ -122,7 +126,10 @@ bool FrameFileIO::saveCRTDFile(QString filename, const QVector<CANFrame>* frames
     QFile *outFile = new QFile(filename);
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return false;
+    }
 
     //write in float format with 6 digits after the decimal point
     outFile->write(QString::number(frames->at(0).timestamp / 1000000.0, 'f', 6).toUtf8() + tr(" CXX GVRET-PC Reverse Engineering Tool Output V").toUtf8() + QString::number(VERSION).toUtf8());
@@ -149,6 +156,7 @@ bool FrameFileIO::saveCRTDFile(QString filename, const QVector<CANFrame>* frames
         outFile->write("\n");
     }
     outFile->close();
+    delete outFile;
 
     return true;
 }
@@ -162,7 +170,10 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector<CANFrame>* frames)
     long long timeStamp = Utility::GetTimeMS();
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return false;
+    }
 
     line = inFile->readLine(); //read out the header first and discard it.
 
@@ -194,6 +205,7 @@ bool FrameFileIO::loadNativeCSVFile(QString filename, QVector<CANFrame>* frames)
         }
     }
     inFile->close();
+    delete inFile;
     return true;
 }
 
@@ -202,7 +214,10 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector<CANFrame>* f
     QFile *outFile = new QFile(filename);
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return false;
+    }
 
     outFile->write("Time Stamp,ID,Extended,Bus,LEN,D1,D2,D3,D4,D5,D6,D7,D8");
     outFile->write("\n");
@@ -237,6 +252,7 @@ bool FrameFileIO::saveNativeCSVFile(QString filename, const QVector<CANFrame>* f
 
     }
     outFile->close();
+    delete outFile;
     return true;
 }
 
@@ -248,7 +264,10 @@ bool FrameFileIO::loadGenericCSVFile(QString filename, QVector<CANFrame>* frames
     long long timeStamp = Utility::GetTimeMS();
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return false;
+    }
 
     line = inFile->readLine(); //read out the header first and discard it.
 
@@ -273,6 +292,7 @@ bool FrameFileIO::loadGenericCSVFile(QString filename, QVector<CANFrame>* frames
         }
     }
     inFile->close();
+    delete inFile;
     return true;
 }
 
@@ -282,7 +302,10 @@ bool FrameFileIO::saveGenericCSVFile(QString filename, const QVector<CANFrame>*
     QFile *outFile = new QFile(filename);
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return false;
+    }
 
     outFile->write("ID,Data Bytes");
     outFile->write("\n");
@@ -302,6 +325,7 @@ bool FrameFileIO::saveGenericCSVFile(QString filename, const QVector<CANFrame>*
 
     }
     outFile->close();
+    delete outFile;
     return true;
 }
 
@@ -345,7 +369,10 @@ bool FrameFileIO::loadLogFile(QString filename, QVector<CANFrame>* frames)
     uint64_t timeStamp = Utility::GetTimeMS();
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return false;
+    }
 
     line = inFile->readLine(); //read out the header first and discard it.
 
@@ -369,6 +396,7 @@ bool FrameFileIO::loadLogFile(QString filename, QVector<CANFrame>* frames)
         frames->append(thisFrame);
     }
     inFile->close();
+    delete inFile;
     return true;
 }
 
@@ -380,7 +408,10 @@ bool FrameFileIO::saveLogFile(QString filename, const QVector<CANFrame>* frames)
     timestamp = QDateTime::currentDateTime();
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return false;
+    }
 
     outFile->write("***BUSMASTER Ver 2.4.0***\n");
     outFile->write("***PROTOCOL CAN***\n");
@@ -419,6 +450,7 @@ bool FrameFileIO::saveLogFile(QString filename, const QVector<CANFrame>* frames)
 
     }
     outFile->close();
+    delete outFile;
     return true;
 }
 
@@ -440,7 +472,10 @@ bool FrameFileIO::loadMicrochipFile(QString filename, QVector<CANFrame>* frames)
     long long timeStamp = Utility::GetTimeMS();
 
     if (!inFile->open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        delete inFile;
         return false;
+    }
 
     //line = inFile->readLine(); //read out the header first and discard it.
 
@@ -472,6 +507,7 @@ bool FrameFileIO::loadMicrochipFile(QString filename, QVector<CANFrame>* frames)
         }
     }
     inFile->close();
+    delete inFile;
     return true;
 }
 
@@ -494,7 +530,10 @@ bool FrameFileIO::saveMicrochipFile(QString filename, const QVector<CANFrame>* f
     timestamp = QDateTime::currentDateTime();
 
     if (!outFile->open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+        delete outFile;
         return false;
+    }
 
     outFile->write("//---------------------------------\n");
     outFile->write("Microchip Technology Inc.\n");
@@ -522,5 +561,6 @@ bool FrameFileIO::saveMicrochipFile(QString filename, const QVector<CANFrame>* f
 
     }
     outFile->close();
+    delete outFile;
     return true;
 }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 07ddfe0..1e02481 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -169,6 +169,9 @@ MainWindow::MainWindow(QWidget *parent) :
     //default height of an item in the table. Need to do this in case
     //of scaling or font differences between different computers.
     CANFrame temp;
+    temp.bus = 0;
+    temp.ID = 0x100;
+    temp.len = 0;
     model->addFrame(temp, true);
     normalRowHeight = ui->canFramesView->rowHeight(0);
     qDebug() << "normal row height = " << normalRowHeight;