diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-09-09 10:17:32 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-15 16:16:12 -0700 |
| commit | b56b5f8e06b4cc4d4105a8141b3d2b8647eedff6 (patch) | |
| tree | b0e92569a8c46cdc2a7f97fba03192c970368916 /futility | |
| parent | 8f400498c68098d024170ccbcb4b3018b3417799 (diff) | |
| download | vboot-b56b5f8e06b4cc4d4105a8141b3d2b8647eedff6.tar.gz | |
Fix more coverity warnings in utilities
Assorted minor code issues, which we should fix so any new errors stand
out more.
BUG=chromium:643769
BRANCH=none
TEST=make runtests
Change-Id: I8fcf0c51e33d5dc49f650f4069f1579091cf188d
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/383713
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_dump_fmap.c | 11 | ||||
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 6 | ||||
| -rw-r--r-- | futility/vb1_helper.c | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/futility/cmd_dump_fmap.c b/futility/cmd_dump_fmap.c index 89b702bd..1c5b070c 100644 --- a/futility/cmd_dump_fmap.c +++ b/futility/cmd_dump_fmap.c @@ -473,16 +473,17 @@ static int do_dump_fmap(int argc, char *argv[]) return 1; } - if (0 != stat(argv[optind], &sb)) { - fprintf(stderr, "%s: can't stat %s: %s\n", + fd = open(argv[optind], O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: can't open %s: %s\n", argv[0], argv[optind], strerror(errno)); return 1; } - fd = open(argv[optind], O_RDONLY); - if (fd < 0) { - fprintf(stderr, "%s: can't open %s: %s\n", + if (0 != fstat(fd, &sb)) { + fprintf(stderr, "%s: can't stat %s: %s\n", argv[0], argv[optind], strerror(errno)); + close(fd); return 1; } diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 77276d34..01c511f6 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -471,6 +471,12 @@ static int do_vbutil_kernel(int argc, char *argv[]) rv = WriteSomeParts(filename, vblock_data, vblock_size, kblob_data, kblob_size); + + free(vmlinuz_buf); + free(t_config_data); + free(t_bootloader_data); + free(vblock_data); + vb2_free_private_key(signpriv_key); return rv; case OPT_MODE_REPACK: diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index e405f24e..8e3cb2e5 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -80,6 +80,7 @@ uint8_t *ReadConfigFile(const char *config_file, uint32_t *config_size) if (CROS_CONFIG_SIZE <= *config_size) { /* room for trailing '\0' */ fprintf(stderr, "Config file %s is too large (>= %d bytes)\n", config_file, CROS_CONFIG_SIZE); + free(config_buf); return NULL; } |