77 |
|
size_t size; |
78 |
|
struct kinfo_proc *kp_stats; |
79 |
|
int procs, i; |
80 |
< |
char *proctitle; |
80 |
> |
char *proctitle, *proctitletmp; |
81 |
|
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
82 |
|
kvm_t *kvmd; |
83 |
|
char **args; |
297 |
|
proc_state_ptr->proctitle = NULL; |
298 |
|
} |
299 |
|
else if(size > 0) { |
300 |
< |
proc_state_ptr->proctitle = malloc(size); |
300 |
> |
proc_state_ptr->proctitle = malloc(size+1); |
301 |
|
if(proc_state_ptr->proctitle == NULL) { |
302 |
|
return NULL; |
303 |
|
} |
304 |
|
p = proctitle; |
305 |
|
proc_state_ptr->proctitle[0] = NULL; |
306 |
|
do { |
307 |
< |
strncat(proc_state_ptr->proctitle, p, strlen(p)); |
308 |
< |
strncat(proc_state_ptr->proctitle, " ", 1); |
307 |
> |
strlcat(proc_state_ptr->proctitle, p, size+1); |
308 |
> |
strlcat(proc_state_ptr->proctitle, " ", size+1); |
309 |
|
p += strlen(p) + 1; |
310 |
|
} while (p < proctitle + size); |
311 |
|
free(proctitle); |
312 |
< |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL; |
312 |
> |
/* remove trailing space */ |
313 |
> |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = \0; |
314 |
|
} |
315 |
|
else { |
316 |
|
free(proctitle); |
327 |
|
} |
328 |
|
while(*args != NULL) { |
329 |
|
if(strlen(proctitle) + strlen(*args) >= alloc) { |
330 |
< |
alloc = (alloc + strlen(*args)) << 1; |
331 |
< |
proctitle = realloc(proctitle, alloc); |
332 |
< |
if(proctitle == NULL) { |
330 |
> |
alloc = (alloc + strlen(*args)) * 2; |
331 |
> |
proctitletmp = realloc(proctitle, alloc); |
332 |
> |
if(proctitletmp == NULL) { |
333 |
|
return NULL; |
334 |
|
} |
335 |
+ |
proctitle = proctitletmp; |
336 |
|
} |
337 |
< |
strncat(proctitle, *args, strlen(*args)); |
338 |
< |
strncat(proctitle, " ", 1); |
337 |
> |
strlcat(proctitle, *args, alloc); |
338 |
> |
strlcat(proctitle, " ", alloc); |
339 |
|
args++; |
340 |
|
} |
341 |
|
/* remove trailing space */ |
342 |
< |
proctitle[strlen(proctitle)-1] = NULL; |
342 |
> |
proctitle[strlen(proctitle)-1] = \0; |
343 |
|
proc_state_ptr->proctitle = proctitle; |
344 |
|
} |
345 |
|
else { |