From 8a5923802216cefb761ce68a360f1a5337f69c12 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek@endlessm.com>
Date: Tue, 28 Apr 2020 11:31:34 -0500
Subject: [PATCH] [core] don't leak logical handle from GetDriveLabel()

* Closes #1525
---
 src/drive.c  |  1 +
 src/rufus.rc | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/drive.c b/src/drive.c
index 99c13211..305e0494 100644
--- a/src/drive.c
+++ b/src/drive.c
@@ -969,6 +969,7 @@ BOOL GetDriveLabel(DWORD DriveIndex, char* letters, char** label)
 			wchar_to_utf8_no_alloc(VolumeName, VolumeLabel, sizeof(VolumeLabel));
 			*label = (VolumeLabel[0] != 0) ? VolumeLabel : STR_NO_LABEL;
 		}
+		safe_closehandle(h);
 		// Drive without volume assigned - always enabled
 		return TRUE;
 	}
diff --git a/src/rufus.rc b/src/rufus.rc
index b4a33911..1e737ad3 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.10.1649"
+CAPTION "Rufus 3.10.1650"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,10,1649,0
- PRODUCTVERSION 3,10,1649,0
+ FILEVERSION 3,10,1650,0
+ PRODUCTVERSION 3,10,1650,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.10.1649"
+            VALUE "FileVersion", "3.10.1650"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.10.1649"
+            VALUE "ProductVersion", "3.10.1650"
         END
     END
     BLOCK "VarFileInfo"