From 65542b91795574403c1597636c11dfee3ed88f7e Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 9 Mar 2023 09:55:17 +0000
Subject: [PATCH] [misc] fix 2 Coverity warnings

* Yay, for once Coverity actually found an actual issue!
---
 src/drive.c  |  2 --
 src/format.c |  5 +++--
 src/rufus.rc | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/drive.c b/src/drive.c
index 361fe82e..90824c17 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -2607,14 +2607,12 @@ BOOL InitializeDisk(HANDLE hDrive)
 			(BYTE*)&CreateDisk, size, NULL, 0, &size, NULL );
 	if (!r) {
 		uprintf("Could not delete drive layout: %s", WindowsErrorString());
-		safe_closehandle(hDrive);
 		return FALSE;
 	}
 
 	r = DeviceIoControl(hDrive, IOCTL_DISK_UPDATE_PROPERTIES, NULL, 0, NULL, 0, &size, NULL );
 	if (!r) {
 		uprintf("Could not refresh drive layout: %s", WindowsErrorString());
-		safe_closehandle(hDrive);
 		return FALSE;
 	}
 
diff --git a/src/format.c b/src/format.c
index b2bc1224..ac0905fc 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1428,7 +1428,6 @@ DWORD WINAPI FormatThread(void* param)
 	HANDLE hPhysicalDrive = INVALID_HANDLE_VALUE;
 	HANDLE hLogicalVolume = INVALID_HANDLE_VALUE;
 	SYSTEMTIME lt;
-	FILE* log_fd;
 	uint8_t *buffer = NULL, extra_partitions = 0;
 	char *bb_msg, *volume_name = NULL;
 	char drive_name[] = "?:\\";
@@ -1561,6 +1560,7 @@ DWORD WINAPI FormatThread(void* param)
 
 	if (IsChecked(IDC_BAD_BLOCKS)) {
 		do {
+			FILE* log_fd;
 			int sel = ComboBox_GetCurSel(hNBPasses);
 			// create a log file for bad blocks report. Since %USERPROFILE% may
 			// have localized characters, we use the UTF-8 API.
@@ -1573,7 +1573,8 @@ DWORD WINAPI FormatThread(void* param)
 				lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond);
 			log_fd = fopenU(logfile, "w+");
 			if (log_fd == NULL) {
-				uprintf("Could not create log file for bad blocks check");
+				uprintf("Error: Could not create log file for bad blocks check");
+				goto out;
 			} else {
 				fprintf(log_fd, APPLICATION_NAME " bad blocks check started on: %04d.%02d.%02d %02d:%02d:%02d",
 				lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond);
diff --git a/src/rufus.rc b/src/rufus.rc
index a2fdbd97..9b52fd2f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.22.1990"
+CAPTION "Rufus 3.22.1991"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,22,1990,0
- PRODUCTVERSION 3,22,1990,0
+ FILEVERSION 3,22,1991,0
+ PRODUCTVERSION 3,22,1991,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.22.1990"
+            VALUE "FileVersion", "3.22.1991"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.22.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.22.1990"
+            VALUE "ProductVersion", "3.22.1991"
         END
     END
     BLOCK "VarFileInfo"