Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows: correctly handle UTF-8 BOM when editing EFI DcsProp XML file

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-06-07 10:21:00 +02:00
parent 9b4e087882
commit 9b0cc3d679
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mount/Mount.c
View File

@@ -10977,15 +10977,24 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
try try
{ {
std::string platforminfo; std::string platforminfo;
DWORD sz; ByteArray fileContent;
DWORD sz, offset;
std::wstring path; std::wstring path;
GetVolumeESP(path); GetVolumeESP(path);
path += L"\\EFI\\VeraCrypt\\PlatformInfo"; path += L"\\EFI\\VeraCrypt\\PlatformInfo";
File fPlatformInfo(path); File fPlatformInfo(path);
fPlatformInfo.GetFileSize(sz); fPlatformInfo.GetFileSize(sz);
platforminfo.resize(sz + 1); fileContent.resize(sz + 1);
platforminfo[sz] = 0; fileContent[sz] = 0;
fPlatformInfo.Read((byte*)&platforminfo[0], sz); fPlatformInfo.Read((byte*)&fileContent[0], sz);
// remove UTF-8 BOM if any
if (0 == memcmp (fileContent.data(), "\xEF\xBB\xBF", 3))
{
offset = 3;
}
else
offset = 0;
platforminfo = (const char*) &fileContent[offset];
TextEditDialogBox(0, hwndDlg, L"PlatformInfo", platforminfo); TextEditDialogBox(0, hwndDlg, L"PlatformInfo", platforminfo);
} }
catch (Exception &e) { e.Show(hwndDlg); } catch (Exception &e) { e.Show(hwndDlg); }
@@ -10997,19 +11006,33 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
try try
{ {
std::string dcsprop; std::string dcsprop;
DWORD sz; ByteArray fileContent;
DWORD sz, offset;
std::wstring path; std::wstring path;
GetVolumeESP(path); GetVolumeESP(path);
path += L"\\EFI\\VeraCrypt\\DcsProp"; path += L"\\EFI\\VeraCrypt\\DcsProp";
File f1(path); File f1(path);
f1.GetFileSize(sz); f1.GetFileSize(sz);
dcsprop.resize(sz + 1); fileContent.resize(sz + 1);
dcsprop[sz] = 0; fileContent[sz] = 0;
f1.Read((byte*)&dcsprop[0], sz); f1.Read((byte*)&fileContent[0], sz);
f1.Close(); f1.Close();
// remove UTF-8 BOM if any
if (0 == memcmp (fileContent.data(), "\xEF\xBB\xBF", 3))
{
offset = 3;
}
else
offset = 0;
dcsprop = (const char*) &fileContent[offset];
if(TextEditDialogBox(0, hwndDlg, L"DcsProp", dcsprop) == IDOK) { if(TextEditDialogBox(0, hwndDlg, L"DcsProp", dcsprop) == IDOK) {
// Add UTF-8 BOM
fileContent.resize (dcsprop.length() + 3);
memcpy (fileContent.data(), "\xEF\xBB\xBF", 3);
memcpy (&fileContent[3], &dcsprop[0], dcsprop.length());
File f2(path,false,true); File f2(path,false,true);
f2.Write((byte*)&dcsprop[0], dcsprop.length()); f2.Write(fileContent.data(), fileContent.size());
f2.Close(); f2.Close();
} }
} }