From 9afd1d05dda6555ab83331e1972f9a29b78e40bc Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 15 Jun 2018 16:50:37 +0100
Subject: [PATCH] [misc] silence an unwarranted coverity warning

---
 ChangeLog.txt |  4 ++--
 src/rufus.c   |  5 +++--
 src/rufus.rc  | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2e1d3776..a4e329cc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,6 @@
 o Version 3.1 (2018.06.??)
-    Fix ISO content not being extracted with GRUB based ISOs (Manjaro, Kaspersky, etc.)
-    Fix text being truncated on some dialogs (mostly for Russian and Thai)
+    Fix extraction of ISO content for GRUB based ISOs (Manjaro, Kaspersky, etc.)
+    Fix text being truncated on some dialogs (mostly Russian and Thai)
     Add detection & warning about the 'Controlled Folder Access' Windows 10 feature
     Improve retry attempts for transient errors
     Update GRUB 2.0 and Grub4DOS to latest
diff --git a/src/rufus.c b/src/rufus.c
index 27ca1057..fedab505 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -3804,8 +3804,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	GetSystemDirectoryW(kernel32_path, ARRAYSIZE(kernel32_path));
 	wcsncat(kernel32_path, L"\\kernel32.dll", ARRAYSIZE(kernel32_path) - wcslen(kernel32_path) - 1);
 	// NB: Because kernel32 should already be loaded, what we do above to ensure that we
-	// (re)pick the system one is mostly unnecessary. But since for a hammer everything is
-	// a nail...
+	// (re)pick the system one is mostly unnecessary. But since for a hammer everything is a
+	// nail... Also, no, Coverity, we never need to care about freeing kernel32 as a library.
+	// coverity[leaked_storage]
 	pfSetDefaultDllDirectories = (SetDefaultDllDirectories_t)
 		GetProcAddress(LoadLibraryW(kernel32_path), "SetDefaultDllDirectories");
 	if (pfSetDefaultDllDirectories != NULL)
diff --git a/src/rufus.rc b/src/rufus.rc
index 1db8a787..e8028b59 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.1.1317"
+CAPTION "Rufus 3.1.1318"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -389,8 +389,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1317,0
- PRODUCTVERSION 3,1,1317,0
+ FILEVERSION 3,1,1318,0
+ PRODUCTVERSION 3,1,1318,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.1.1317"
+            VALUE "FileVersion", "3.1.1318"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.1.1317"
+            VALUE "ProductVersion", "3.1.1318"
         END
     END
     BLOCK "VarFileInfo"