emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: remedy several 'coverity scan' resource leaks

Browse Source 
This commit will place the 'file2strvec' function on a
par with the 'file2str' function if ENOMEM was raised.

Plus, just to keep coverity happy, we'll also clean up
after potential failures with the 'openproc' function.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2021-10-27 00:00:00 -05:00 committed by Craig Small
parent dfcdc0c2c0
commit 3e43e6273e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proc/readproc.c
View File

@ -784,7 +784,10 @@ static char **file2strvec(const char *directory, const char *what) {
if (n <= 0) break; /* unneeded (end_of_file = 1) but avoid realloc */ if (n <= 0) break; /* unneeded (end_of_file = 1) but avoid realloc */
rbuf = realloc(rbuf, tot + n); /* allocate more memory */ rbuf = realloc(rbuf, tot + n); /* allocate more memory */
if (!rbuf) return NULL; if (!rbuf) {
close(fd);
return NULL;
}
memcpy(rbuf + tot, buf, n); /* copy buffer into it */ memcpy(rbuf + tot, buf, n); /* copy buffer into it */
tot += n; /* increment total byte ctr */ tot += n; /* increment total byte ctr */
if (end_of_file) if (end_of_file)
@ -1546,11 +1549,18 @@ PROCTAB *openproc(unsigned flags, ...) {
va_end(ap); va_end(ap);
if (!src_buffer if (!src_buffer
&& !(src_buffer = malloc(MAX_BUFSZ))) && !(src_buffer = malloc(MAX_BUFSZ))) {
closedir(PT->procfs);
free(PT);
return NULL; return NULL;
}
if (!dst_buffer if (!dst_buffer
&& !(dst_buffer = malloc(MAX_BUFSZ))) && !(dst_buffer = malloc(MAX_BUFSZ))) {
closedir(PT->procfs);
free(src_buffer);
free(PT);
return NULL; return NULL;
}
return PT; return PT;
} }