rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some leak on error found by coverity scan

Browse source
This commit is contained in:
Andrea Mazzoleni 2015-01-30 23:00:27 +01:00
parent c110a00452
commit 65bfca5699
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmdline/unix.c
View file

@ -349,12 +349,14 @@ static dev_t devread(const char* path)
ret = read(f, buf, sizeof(buf));
if (ret < 0) {
/* LCOV_EXCL_START */
close(f);
fprintf(stderr, "Failed to read '%s'.\n", path);
return 0;
/* LCOV_EXCL_STOP */
}
if (ret == sizeof(buf)) {
/* LCOV_EXCL_START */
close(f);
fprintf(stderr, "Too long read '%s'.\n", path);
return 0;
/* LCOV_EXCL_STOP */
@ -365,6 +367,7 @@ static dev_t devread(const char* path)
ma = strtoul(buf, &e, 10);
if (*e != ':') {
/* LCOV_EXCL_START */
close(f);
fprintf(stderr, "Invalid format in '%s' for '%s'.\n", path, buf);
return 0;
/* LCOV_EXCL_STOP */
@ -373,6 +376,7 @@ static dev_t devread(const char* path)
mi = strtoul(e+1, &e, 10);
if (*e != 0 && !isspace(*e)) {
/* LCOV_EXCL_START */
close(f);
fprintf(stderr, "Invalid format in '%s' for '%s'.\n", path, buf);
return 0;
/* LCOV_EXCL_STOP */
@ -470,12 +474,14 @@ static int devtree(const char* name, dev_t device, devinfo_t* parent, tommy_list
device = devread(path);
if (!device) {
/* LCOV_EXCL_START */
closedir(d);
return -1;
/* LCOV_EXCL_STOP */
}
if (devtree(name, device, parent, list) != 0) {
/* LCOV_EXCL_START */
closedir(d);
return -1;
/* LCOV_EXCL_STOP */
}
@ -567,6 +573,7 @@ static int devscan(tommy_list* list)
device = devread(path);
if (!device) {
/* LCOV_EXCL_START */
closedir(d);
return -1;
/* LCOV_EXCL_STOP */
}
@ -585,6 +592,7 @@ static int devscan(tommy_list* list)
/* get the device file */
if (devresolve(device, path, sizeof(path)) != 0) {
/* LCOV_EXCL_START */
closedir(d);
return -1;
/* LCOV_EXCL_STOP */
}
@ -602,7 +610,6 @@ static int devscan(tommy_list* list)
}
closedir(d);
return 0;
}
#endif