bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix possible crash in get_cpu_instance

This commit is contained in:
Doug MacEachern 2004-08-27 23:06:46 +00:00
parent a8ab98e6cb
commit ed77b95632
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/win32/win32_sigar.c
View File

@ -294,6 +294,15 @@ static PERF_INSTANCE_DEFINITION *get_cpu_instance(sigar_t *sigar,
return NULL; return NULL;
} }
/* XXX dont know why this happens, seen on
* 2003 server mail.hyperic.net
*/
if (object->NumInstances < 1) {
*err = ENOENT;
return NULL;
}
for (i=0, counter = PdhFirstCounter(object); for (i=0, counter = PdhFirstCounter(object);
i<object->NumCounters; i<object->NumCounters;
i++, counter = PdhNextCounter(counter)) i++, counter = PdhNextCounter(counter))
@ -332,7 +341,7 @@ SIGAR_DECLARE(int) sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
inst = get_cpu_instance(sigar, (DWORD*)&perf_offsets, 0, &err); inst = get_cpu_instance(sigar, (DWORD*)&perf_offsets, 0, &err);
if (!inst) { if (!inst) {
return GetLastError(); return err;
} }
/* first instance is total, rest are per-cpu */ /* first instance is total, rest are per-cpu */