null ref fix

EricZimmerman · Jan 15, 2019 · 3d21bae · 3d21bae
1 parent eddc100
commit 3d21bae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/PECmd/Program.cs b/PECmd/Program.cs
@@ -653,7 +653,7 @@ private static CsvOut GetCsvFormat(IPrefetch pf)
             var volName = string.Empty;
             var volSerial = string.Empty;
 
-            if (pf.VolumeInformation.Count > 0)
+            if (pf.VolumeInformation?.Count > 0)
             {
                 var vol0Create = _fluentCommandLineParser.Object.LocalTime
                     ? pf.VolumeInformation[0].CreationTime.ToLocalTime()
@@ -756,7 +756,7 @@ private static CsvOut GetCsvFormat(IPrefetch pf)
                 csOut.PreviousRun6 = lrt.ToString(_fluentCommandLineParser.Object.DateTimeFormat);
             }
 
-            if (pf.VolumeInformation.Count > 1)
+            if (pf.VolumeInformation?.Count > 1)
             {
                 var vol1 = _fluentCommandLineParser.Object.LocalTime
                     ? pf.VolumeInformation[1].CreationTime.ToLocalTime()
@@ -766,16 +766,20 @@ private static CsvOut GetCsvFormat(IPrefetch pf)
                 csOut.Volume1Serial = pf.VolumeInformation[1].SerialNumber;
             }
 
-            if (pf.VolumeInformation.Count > 2)
+            if (pf.VolumeInformation?.Count > 2)
             {
                 csOut.Note = "File contains > 2 volumes! Please inspect output from main program for full details!";
             }
 
             var sbDirs = new StringBuilder();
-            foreach (var volumeInfo in pf.VolumeInformation)
+            if (pf.VolumeInformation != null)
             {
-                sbDirs.Append(string.Join(", ", volumeInfo.DirectoryNames));
+                foreach (var volumeInfo in pf.VolumeInformation)
+                {
+                    sbDirs.Append(string.Join(", ", volumeInfo.DirectoryNames));
+                }
             }
+
 
             if (pf.ParsingError)
             {

diff --git a/PECmd/Properties/AssemblyInfo.cs b/PECmd/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Eric Zimmerman")]
 [assembly: AssemblyProduct("PECmd")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("saericzimmerman@gmail.com")]
 [assembly: AssemblyCulture("")]
 
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.2.0.1")]
-[assembly: AssemblyFileVersion("1.2.0.1")]
+[assembly: AssemblyVersion("1.2.0.2")]
+[assembly: AssemblyFileVersion("1.2.0.2")]