summaryrefslogtreecommitdiff
path: root/libps
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2014-11-02 12:29:27 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2014-11-02 12:37:29 +0100
commit673603dae49fd06de782780a38e2914ed8cd8777 (patch)
tree2ec8dc979bf6e1c30a4d04a682bc90dd74192cd6 /libps
parent139b283e0d40a3a482a61e1fb9afb5381323d8d0 (diff)
Fix proc_getprocinfo calls
The procinfoCnt argument is the number of elements of the procinfo_t array, not its size in bytes. * exec/elfcore.c (dump_core): Fix procinfoCnt given to proc_getprocinfo. * libps/procstat.c (merge_procinfo): Likewise. * utils/login.c (check_owned): Likewise.
Diffstat (limited to 'libps')
-rw-r--r--libps/procstat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libps/procstat.c b/libps/procstat.c
index 0d4a565b..b00c9e41 100644
--- a/libps/procstat.c
+++ b/libps/procstat.c
@@ -192,7 +192,7 @@ merge_procinfo (struct proc_stat *ps, ps_flags_t need, ps_flags_t have)
return ENOMEM;
}
new_pi = ps->proc_info;
- new_pi_size = ps->proc_info_size;
+ new_pi_size = ps->proc_info_size / sizeof(*(procinfo_t)0);
if (really_need & PSTAT_THREAD_WAITS)
/* We're going to get thread waits info, so make some storage for it too.*/
@@ -240,7 +240,7 @@ merge_procinfo (struct proc_stat *ps, ps_flags_t need, ps_flags_t have)
else
free (ps->proc_info);
ps->proc_info = new_pi;
- ps->proc_info_size = new_pi_size;
+ ps->proc_info_size = new_pi_size * sizeof(*(procinfo_t)0);
ps->proc_info_vm_alloced = 1;
}