diff options
| author | bapt <bapt@FreeBSD.org> | 2015-10-13 19:44:36 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-10-13 19:44:36 +0000 |
| commit | c8d6d4a78596005d50c30c7ab4f623a601ef0b39 (patch) | |
| tree | e5218cae2f48913719be46210d8d92085cb2511f /lib/libprocstat/libprocstat.c | |
| parent | 2a77c3b71d27973d4ffac086902715be69266202 (diff) | |
| parent | 384c892651c52e57063356328dfcd28914bc4b15 (diff) | |
| download | FreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.zip FreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.tar.gz | |
Merge from head
Diffstat (limited to 'lib/libprocstat/libprocstat.c')
| -rw-r--r-- | lib/libprocstat/libprocstat.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index c292d5d..3de64aa 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -767,6 +767,8 @@ kinfo_getfile_core(struct procstat_core *core, int *cntp) eb = buf + len; while (bp < eb) { kf = (struct kinfo_file *)(uintptr_t)bp; + if (kf->kf_structsize == 0) + break; bp += kf->kf_structsize; cnt++; } @@ -782,6 +784,8 @@ kinfo_getfile_core(struct procstat_core *core, int *cntp) /* Pass 2: unpack */ while (bp < eb) { kf = (struct kinfo_file *)(uintptr_t)bp; + if (kf->kf_structsize == 0) + break; /* Copy/expand into pre-zeroed buffer */ memcpy(kp, kf, kf->kf_structsize); /* Advance to next packed record */ @@ -1863,6 +1867,8 @@ kinfo_getvmmap_core(struct procstat_core *core, int *cntp) eb = buf + len; while (bp < eb) { kv = (struct kinfo_vmentry *)(uintptr_t)bp; + if (kv->kve_structsize == 0) + break; bp += kv->kve_structsize; cnt++; } @@ -1878,6 +1884,8 @@ kinfo_getvmmap_core(struct procstat_core *core, int *cntp) /* Pass 2: unpack */ while (bp < eb) { kv = (struct kinfo_vmentry *)(uintptr_t)bp; + if (kv->kve_structsize == 0) + break; /* Copy/expand into pre-zeroed buffer */ memcpy(kp, kv, kv->kve_structsize); /* Advance to next packed record */ |
