From a813fee3a0e52db9ae7f8ee4a6816e1a3caa3e97 Mon Sep 17 00:00:00 2001 From: Steffen Pankratz Date: Mon, 29 Feb 2016 18:37:21 +0100 Subject: - fixed typos prefox <-> prefix --- cmake/Findlibusb.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake index 69811bc..3e21b98 100644 --- a/cmake/Findlibusb.cmake +++ b/cmake/Findlibusb.cmake @@ -10,10 +10,10 @@ find_path(LIBUSB_INCLUDE_DIR ) if (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefix passed to find_library") set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library") else (libusb_USE_STATIC_LIBS AND NOT MSVC) - set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library") + set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefix passed to find_library") set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library") endif (libusb_USE_STATIC_LIBS AND NOT MSVC) -- cgit v1.1 From 6d7d35fa7630dde930c4647af41b3d8d76987f45 Mon Sep 17 00:00:00 2001 From: Steffen Pankratz Date: Mon, 29 Feb 2016 18:39:21 +0100 Subject: - fixed memory leak Memory allocated by 'new[]' should be deallocated by 'delete[]'. --- heimdall-frontend/source/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heimdall-frontend/source/mainwindow.cpp b/heimdall-frontend/source/mainwindow.cpp index e110d69..8167e5a 100644 --- a/heimdall-frontend/source/mainwindow.cpp +++ b/heimdall-frontend/source/mainwindow.cpp @@ -131,7 +131,7 @@ bool MainWindow::ReadPit(QFile *file) file->close(); bool success = currentPitData.Unpack(buffer); - delete buffer; + delete[] buffer; if (!success) currentPitData.Clear(); -- cgit v1.1 From 46c4f8be14aff1794f88f675ab372a8a07261c1a Mon Sep 17 00:00:00 2001 From: Steffen Pankratz Date: Mon, 29 Feb 2016 18:42:55 +0100 Subject: - fixed logical error, wrong variable was used in error message --- heimdall/source/FlashAction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heimdall/source/FlashAction.cpp b/heimdall/source/FlashAction.cpp index 590e0b5..d9203b0 100644 --- a/heimdall/source/FlashAction.cpp +++ b/heimdall/source/FlashAction.cpp @@ -185,7 +185,7 @@ static bool sendTotalTransferSize(BridgeManager *bridgeManager, const vector Date: Mon, 29 Feb 2016 19:50:53 +0100 Subject: - fixed possible null pointer access --- heimdall-frontend/source/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heimdall-frontend/source/mainwindow.cpp b/heimdall-frontend/source/mainwindow.cpp index 8167e5a..f06fb4e 100644 --- a/heimdall-frontend/source/mainwindow.cpp +++ b/heimdall-frontend/source/mainwindow.cpp @@ -659,7 +659,7 @@ void MainWindow::SelectPartitionName(int index) partitionFileGroup->setTitle(title); - if (!fileInfo.GetFilename().isEmpty()) + if (pitEntry && !fileInfo.GetFilename().isEmpty()) { QString partitionFilename = pitEntry->GetFlashFilename(); int lastPeriod = partitionFilename.lastIndexOf(QChar('.')); -- cgit v1.1