Added try/catch to FileSHA.

sarbian · Sep 17, 2015 · 1577326 · 1577326
1 parent d564533
commit 1577326
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("2.6.10")]
+[assembly: AssemblyVersion("2.6.11")]
 [assembly: KSPAssembly("ModuleManager", 2, 5)]
 
 // The following attributes are used to specify the signing key for the assembly, 

diff --git a/moduleManager.cs b/moduleManager.cs
@@ -910,25 +910,33 @@ static bool checkValues(ConfigNode node)
 
         private string FileSHA(string filename)
         {
-            if (File.Exists(filename))
-            {
-                System.Security.Cryptography.SHA256 sha = System.Security.Cryptography.SHA256.Create();
-
-                byte[] data = null;
-                using (FileStream fs = File.Open(filename, FileMode.Open, FileAccess.Read))
-                {
-                    data = sha.ComputeHash(fs);
-                }
-
-                string hashedValue = string.Empty;
-
-                foreach (byte b in data)
-                {
-                    hashedValue += String.Format("{0,2:x2}", b);
-                }
-
-                return hashedValue;
-            }
+			try
+			{
+				if (File.Exists(filename))
+	            {
+	                System.Security.Cryptography.SHA256 sha = System.Security.Cryptography.SHA256.Create();
+
+	                byte[] data = null;
+	                using (FileStream fs = File.Open(filename, FileMode.Open, FileAccess.Read))
+	                {
+	                    data = sha.ComputeHash(fs);
+	                }
+
+	                string hashedValue = string.Empty;
+
+	                foreach (byte b in data)
+	                {
+	                    hashedValue += String.Format("{0,2:x2}", b);
+	                }
+
+	                return hashedValue;
+	            }
+			}
+			catch (Exception e)
+			{
+				log("Exception hashing file " + filename + "\n" + e.ToString());
+				return "0";
+			}
             return "0";
         }