Changeset 1742

Timestamp:

2/3/2010 1:19:44 AM (2 years ago)

Author:

lowjoel

Message:

Fixed code usage error: When we find a directory in the list of plausible deniability decoy files we would add the files in the directory to the list. This results in directory contents being added recursively for every decoy we copy. In addition, we also did not check that the files in the list of decoys exist and we just picked any one. This could have resulted in non-existent files being picked for use which throws a FileNotFoundException?.

File:

• branches/eraser6/6.0/Eraser.Manager/FileSystem.cs (modified) (2 diffs)

branches/eraser6/6.0/Eraser.Manager/FileSystem.cs

@@ -114 +114 @@
             {
                 string shadowFile = null;
-                IList<string> entries = ManagerLibrary.Settings.PlausibleDeniabilityFiles;
+                List<string> entries = new List<string>(
+                    ManagerLibrary.Settings.PlausibleDeniabilityFiles);
                 Prng prng = PrngManager.GetInstance(ManagerLibrary.Settings.ActivePrng);
                 do
@@ -136 +137 @@
                     entries.RemoveAt(index);
                 }
-                while (shadowFile == null || shadowFile.Length == 0);
+                while (shadowFile == null || shadowFile.Length == 0 ||
+                    !System.IO.File.Exists(shadowFile));
                 shadowFileInfo = new FileInfo(shadowFile);
             }