Merge pull request dotnet#481 from stephentoub/fix_process_guards

Guard _processInfo access with EnsureState checks
jkronk · Jan 20, 2015 · 3786e9c · 3786e9c
2 parents 7aaecaa + fab4dfa
commit 3786e9c
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs b/src/System.Diagnostics.Process/src/System/Diagnostics/Process.cs
@@ -314,6 +314,7 @@ public long NonpagedSystemMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._poolNonpagedBytes;
             }
         }
@@ -323,6 +324,7 @@ public long PagedMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._pageFileBytes;
             }
         }
@@ -332,6 +334,7 @@ public long PagedSystemMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._poolPagedBytes;
             }
         }
@@ -341,6 +344,7 @@ public long PeakPagedMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._pageFileBytesPeak;
             }
         }
@@ -350,6 +354,7 @@ public long PeakWorkingSet64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._workingSetPeak;
             }
         }
@@ -359,6 +364,7 @@ public long PeakVirtualMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._virtualBytesPeak;
             }
         }
@@ -424,6 +430,7 @@ public long PrivateMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._privateBytes;
             }
         }
@@ -472,6 +479,7 @@ public int SessionId
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._sessionId;
             }
         }
@@ -533,6 +541,7 @@ public long VirtualMemorySize64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._virtualBytes;
             }
         }
@@ -643,6 +652,7 @@ public long WorkingSet64
         {
             get
             {
+                EnsureState(State.HaveProcessInfo);
                 return _processInfo._workingSet;
             }
         }