[ros-diffs] [cwittich] 67373: [TASKMGR] fix process cpu time CORE-9562

[cwittich]

Author: cwittich
Date: Thu Apr 23 20:18:38 2015
New Revision: 67373

URL: http://svn.reactos.org/svn/reactos?rev=67373&view=rev
Log:
[TASKMGR]
fix process cpu time
CORE-9562

Modified:
    trunk/reactos/base/applications/taskmgr/perfdata.c

Modified: trunk/reactos/base/applications/taskmgr/perfdata.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/perfdata.c?rev=67373&r1=67372&r2=67373&view=diff
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfdata.c  [iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/perfdata.c  [iso-8859-1] Thu Apr 23 
20:18:38 2015
@@ -331,20 +331,18 @@
 
     /* Now alloc a new PERFDATA array and fill in the data */
     pPerfData = (PPERFDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 
sizeof(PERFDATA) * ProcessCount);
-    if (pPerfDataOld) {
-        HeapFree(GetProcessHeap(), 0, pPerfDataOld);
-    }
-    pPerfDataOld = pPerfData;
 
     pSPI = (PSYSTEM_PROCESS_INFORMATION)pBuffer;
     for (Idx=0; Idx<ProcessCount; Idx++) {
         /* Get the old perf data for this process (if any) */
         /* so that we can establish delta values */
         pPDOld = NULL;
-        for (Idx2=0; Idx2<ProcessCountOld; Idx2++) {
-            if (pPerfDataOld[Idx2].ProcessId == pSPI->UniqueProcessId) {
-                pPDOld = &pPerfDataOld[Idx2];
-                break;
+        if (pPerfDataOld) {
+            for (Idx2=0; Idx2<ProcessCountOld; Idx2++) {
+                if (pPerfDataOld[Idx2].ProcessId == pSPI->UniqueProcessId) {
+                    pPDOld = &pPerfDataOld[Idx2];
+                    break;
+                }
             }
         }
 
@@ -447,6 +445,10 @@
         pSPI = (PSYSTEM_PROCESS_INFORMATION)((LPBYTE)pSPI + 
pSPI->NextEntryOffset);
     }
     HeapFree(GetProcessHeap(), 0, pBuffer);
+    if (pPerfDataOld) {
+        HeapFree(GetProcessHeap(), 0, pPerfDataOld);
+    }
+    pPerfDataOld = pPerfData;
     LeaveCriticalSection(&PerfDataCriticalSection);
 }