diff options
Diffstat (limited to 'src/Mount/Favorites.cpp')
-rw-r--r-- | src/Mount/Favorites.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Mount/Favorites.cpp b/src/Mount/Favorites.cpp index 93b7a5a6..de4d5a08 100644 --- a/src/Mount/Favorites.cpp +++ b/src/Mount/Favorites.cpp @@ -590,61 +590,61 @@ namespace VeraCrypt } } DWORD size; char *favoritesXml = LoadFile (favoritesFilePath.c_str(), &size); if (systemFavorites && !IsAdmin() && !noUacElevation) DeleteFile (GetConfigPath (TC_APPD_FILENAME_SYSTEM_FAVORITE_VOLUMES)); char *xml = favoritesXml; char mountPoint[MAX_PATH], volume[MAX_PATH]; if (xml == NULL) return; while (xml = XmlFindElement (xml, "volume")) { FavoriteVolume favorite; XmlGetAttributeText (xml, "mountpoint", mountPoint, sizeof (mountPoint)); favorite.MountPoint = Utf8StringToWide (mountPoint); XmlGetNodeText (xml, volume, sizeof (volume)); favorite.Path = Utf8StringToWide (volume); char label[1024]; XmlGetAttributeText (xml, "ID", label, sizeof (label)); if (strlen (label) == (2*VOLUME_ID_SIZE)) { - std::vector<byte> arr; + std::vector<uint8> arr; if (HexWideStringToArray (Utf8StringToWide (label).c_str(), arr) && arr.size() == VOLUME_ID_SIZE) { memcpy (favorite.VolumeID, &arr[0], VOLUME_ID_SIZE); } } XmlGetAttributeText (xml, "label", label, sizeof (label)); favorite.Label = Utf8StringToWide (label); XmlGetAttributeText (xml, "pim", label, sizeof (label)); if (strlen(label) == 0) { /* support old attribute name before it was changed to PIM*/ XmlGetAttributeText (xml, "pin", label, sizeof (label)); } if (label[0]) { favorite.Pim = strtol (label, NULL, 10); if (favorite.Pim < 0 || favorite.Pim > (systemFavorites? MAX_BOOT_PIM_VALUE : MAX_PIM_VALUE)) favorite.Pim = -1; } else favorite.Pim = -1; char boolVal[2]; XmlGetAttributeText (xml, "readonly", boolVal, sizeof (boolVal)); if (boolVal[0]) favorite.ReadOnly = (boolVal[0] == '1'); XmlGetAttributeText (xml, "removable", boolVal, sizeof (boolVal)); |