Linux/macOS: check if volume doesn't exist before starting the mount …

…operation.
veracrypt · Dec 23, 2024 · b6e698b · b6e698b
1 parent f05ce4e
commit b6e698b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
@@ -826,6 +826,19 @@ namespace VeraCrypt
 			return volume;
 		}
 
+
+		// check if the volume path exists using stat function. Only ENOENT error is handled to exclude permission denied error
+		struct stat statBuf;
+		if (stat (string (*options.Path).c_str(), &statBuf) != 0)
+		{
+			if (errno == ENOENT)
+			{
+				SystemException ex (SRC_POS);
+				ShowError (ex);
+				return volume;
+			}
+		}
+
 		try
 		{
 			if ((!options.Password || options.Password->IsEmpty())

diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
@@ -1335,6 +1335,18 @@ namespace VeraCrypt
 			return volume;
 		}
 
+		// check if the volume path exists using stat function. Only ENOENT error is handled to exclude permission denied error
+		struct stat statBuf;
+		if (stat (string (*options.Path).c_str(), &statBuf) != 0)
+		{
+			if (errno == ENOENT)
+			{
+				SystemException ex (SRC_POS);
+				ShowError (ex);
+				return volume;
+			}
+		}
+
 		// Mount point
 		if (!options.MountPoint && !options.NoFilesystem)
 			options.MountPoint.reset (new DirectoryPath (AskString (_("Enter mount directory [default]: "))));