Fix: JSON File import

rzander · Oct 3, 2017 · eb9b762 · eb9b762
1 parent 79135b2
commit eb9b762
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/RZ.OneGetProvider/RZUpdate.cs b/RZ.OneGetProvider/RZUpdate.cs
@@ -259,7 +259,12 @@ internal static AddSoftware ParseJSON(string sFile)
                 {
                     JavaScriptSerializer ser = new JavaScriptSerializer();
                     AddSoftware lRes = ser.Deserialize<AddSoftware>(File.ReadAllText(sFile));
-                    lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    if (lRes.PreRequisites != null)
+                    {
+                        lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    }
+                    else
+                        lRes.PreRequisites = new string[0];
                     return lRes;
                 }
                 catch { }
@@ -1555,7 +1560,7 @@ private bool _checkFileSHA256(string FilePath, string SHA256)
         {
             try
             {
-                using (var sha256 = System.Security.Cryptography.SHA1.Create())
+                using (var sha256 = System.Security.Cryptography.SHA256.Create())
                 {
                     using (var stream = File.OpenRead(FilePath))
                     {

diff --git a/RZUpdate/RZUpdate.cs b/RZUpdate/RZUpdate.cs
@@ -259,7 +259,12 @@ internal static AddSoftware ParseJSON(string sFile)
                 {
                     JavaScriptSerializer ser = new JavaScriptSerializer();
                     AddSoftware lRes = ser.Deserialize<AddSoftware>(File.ReadAllText(sFile));
-                    lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    if (lRes.PreRequisites != null)
+                    {
+                        lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    }
+                    else
+                        lRes.PreRequisites = new string[0];
                     return lRes;
                 }
                 catch { }
@@ -1555,7 +1560,7 @@ private bool _checkFileSHA256(string FilePath, string SHA256)
         {
             try
             {
-                using (var sha256 = System.Security.Cryptography.SHA1.Create())
+                using (var sha256 = System.Security.Cryptography.SHA256.Create())
                 {
                     using (var stream = File.OpenRead(FilePath))
                     {

diff --git a/RuckZuck_Tool/RZUpdate.cs b/RuckZuck_Tool/RZUpdate.cs
@@ -259,7 +259,12 @@ internal static AddSoftware ParseJSON(string sFile)
                 {
                     JavaScriptSerializer ser = new JavaScriptSerializer();
                     AddSoftware lRes = ser.Deserialize<AddSoftware>(File.ReadAllText(sFile));
-                    lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    if (lRes.PreRequisites != null)
+                    {
+                        lRes.PreRequisites = lRes.PreRequisites.Where(x => !string.IsNullOrEmpty(x)).ToArray();
+                    }
+                    else
+                        lRes.PreRequisites = new string[0];
                     return lRes;
                 }
                 catch { }
@@ -1555,7 +1560,7 @@ private bool _checkFileSHA256(string FilePath, string SHA256)
         {
             try
             {
-                using (var sha256 = System.Security.Cryptography.SHA1.Create())
+                using (var sha256 = System.Security.Cryptography.SHA256.Create())
                 {
                     using (var stream = File.OpenRead(FilePath))
                     {