diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-09-02 12:17:29 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-02-02 04:09:48 +0000 |
| commit | 909a7ea81d4f4a42a7089970b4fbf77336ce320c (patch) | |
| tree | 50814cc2128e1a52dabe499da2249a9616336259 | |
| parent | a929c2755eee3dec286585c58f3ac93690c7d270 (diff) | |
| download | vboot-909a7ea81d4f4a42a7089970b4fbf77336ce320c.tar.gz | |
cgpt: Fix coverity warnings
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: I9e7ce2ba226993fc53d1745c98381cb7cfcb7712
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/380448
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/897387
Reviewed-by: Wei-Han Chen <stimim@chromium.org>
Commit-Queue: Wei-Han Chen <stimim@chromium.org>
Tested-by: Wei-Han Chen <stimim@chromium.org>
| -rw-r--r-- | cgpt/cgpt_nor.c | 1 | ||||
| -rw-r--r-- | cgpt/cmd_find.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cgpt/cgpt_nor.c b/cgpt/cgpt_nor.c index bf0a1764..d2e7eafa 100644 --- a/cgpt/cgpt_nor.c +++ b/cgpt/cgpt_nor.c @@ -77,6 +77,7 @@ int ForkExecL(const char *cwd, const char *cmd, ...) { const char **argv = calloc(argc + 1, sizeof(char *)); if (argv == NULL) { errno = ENOMEM; + va_end(ap); return -1; } argv[0] = cmd; diff --git a/cgpt/cmd_find.c b/cgpt/cmd_find.c index d0f048f2..68ba6a85 100644 --- a/cgpt/cmd_find.c +++ b/cgpt/cmd_find.c @@ -37,6 +37,7 @@ static void Usage(void) static uint8_t *ReadFile(const char *filename, uint64_t *size) { FILE *f; uint8_t *buf; + long pos; f = fopen(filename, "rb"); if (!f) { @@ -44,7 +45,10 @@ static uint8_t *ReadFile(const char *filename, uint64_t *size) { } fseek(f, 0, SEEK_END); - *size = ftell(f); + pos = ftell(f); + if (pos < 0) + return NULL; + *size = pos; rewind(f); buf = malloc(*size); |