matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnstat: fix error handling 

Error handling was silent and had leaks.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2015-12-30 17:28:11 -08:00
parent e49b51d663
commit b90b773ca6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc/lnstat_util.c
View File

@ -172,8 +172,10 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
/* allocate */ /* allocate */
lf = malloc(sizeof(*lf)); lf = malloc(sizeof(*lf));
if (!lf) if (!lf) {
fprintf(stderr, "out of memory\n");
return NULL; return NULL;
}
/* initialize */ /* initialize */
memset(lf, 0, sizeof(*lf)); memset(lf, 0, sizeof(*lf));
@ -190,6 +192,7 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
/* open */ /* open */
lf->fp = fopen(lf->path, "r"); lf->fp = fopen(lf->path, "r");
if (!lf->fp) { if (!lf->fp) {
perror(lf->path);
free(lf); free(lf);
return NULL; return NULL;
} }
@ -256,12 +259,16 @@ struct lnstat_file *lnstat_scan_dir(const char *path, const int num_req_files,
continue; continue;
lf = alloc_and_open(path, de->d_name); lf = alloc_and_open(path, de->d_name);
if (!lf) if (!lf) {
closedir(dir);
return NULL; return NULL;
}
/* fill in field structure */ /* fill in field structure */
if (lnstat_scan_fields(lf) < 0) if (lnstat_scan_fields(lf) < 0) {
closedir(dir);
return NULL; return NULL;
}
/* prepend to global list */ /* prepend to global list */
lf->next = lnstat_files; lf->next = lnstat_files;