diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-04-08 09:10:20 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2021-04-08 13:16:13 +0200 |
| commit | 7b3bde801ba34c945465d6fbcebd56f14616ce0d (patch) | |
| tree | 2c5ba30963c39e269444365228643305e270a032 /tools | |
| parent | d4ca7f6dcab47be3b00ff2850d102a20e931e2ba (diff) | |
| download | upstream-7b3bde801ba34c945465d6fbcebd56f14616ce0d.tar.gz upstream-7b3bde801ba34c945465d6fbcebd56f14616ce0d.tar.bz2 upstream-7b3bde801ba34c945465d6fbcebd56f14616ce0d.zip | |
firmware-utils: bcm4908img: fix uninitialized var usage
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 5a2086d230063b2f83a436ed37b0f6a92706bcb9)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/firmware-utils/src/bcm4908img.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/firmware-utils/src/bcm4908img.c b/tools/firmware-utils/src/bcm4908img.c index d97e54e0f6..402d317190 100644 --- a/tools/firmware-utils/src/bcm4908img.c +++ b/tools/firmware-utils/src/bcm4908img.c @@ -567,8 +567,8 @@ out: static int bcm4908img_extract(int argc, char **argv) { struct bcm4908img_info info; const char *pathname = NULL; + const char *type = NULL; uint8_t buf[1024]; - const char *type; size_t offset; size_t length; size_t bytes; @@ -600,7 +600,11 @@ static int bcm4908img_extract(int argc, char **argv) { goto err_close; } - if (!strcmp(type, "cferom")) { + if (!type) { + err = -EINVAL; + fprintf(stderr, "No data to extract specified\n"); + goto err_close; + } else if (!strcmp(type, "cferom")) { offset = info.cferom_offset; length = info.bootfs_offset - offset; if (!length) { @@ -625,7 +629,7 @@ static int bcm4908img_extract(int argc, char **argv) { if (!length) { err = -EINVAL; - fprintf(stderr, "No data to extract specified\n"); + fprintf(stderr, "Failed to find requested data in input image\n"); goto err_close; } |