nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[core] don't leak logical handle from GetDriveLabel()

Browse source 
* Closes #1525
This commit is contained in:
Derek Foreman 2020-04-28 11:31:34 -05:00 • committed by Pete Batard
parent 077f143252
commit 8a59238022
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/drive.c
View file

@ -969,6 +969,7 @@ BOOL GetDriveLabel(DWORD DriveIndex, char* letters, char** label)
wchar_to_utf8_no_alloc(VolumeName, VolumeLabel, sizeof(VolumeLabel)); wchar_to_utf8_no_alloc(VolumeName, VolumeLabel, sizeof(VolumeLabel));
*label = (VolumeLabel[0] != 0) ? VolumeLabel : STR_NO_LABEL; *label = (VolumeLabel[0] != 0) ? VolumeLabel : STR_NO_LABEL;
} }
safe_closehandle(h);
// Drive without volume assigned - always enabled // Drive without volume assigned - always enabled
return TRUE; return TRUE;
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.10.1649" CAPTION "Rufus 3.10.1650"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,10,1649,0 FILEVERSION 3,10,1650,0
PRODUCTVERSION 3,10,1649,0 PRODUCTVERSION 3,10,1650,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.10.1649" VALUE "FileVersion", "3.10.1650"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.10.exe" VALUE "OriginalFilename", "rufus-3.10.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.10.1649" VALUE "ProductVersion", "3.10.1650"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"