[openwrt/openwrt] firmware-utils: bcm4908img: fix uninitialized var usage

[LEDE Commits]

rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/7b3bde801ba34c945465d6fbcebd56f14616ce0d

commit 7b3bde801ba34c945465d6fbcebd56f14616ce0d
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Thu Apr 8 09:10:20 2021 +0200

    firmware-utils: bcm4908img: fix uninitialized var usage
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
    (cherry picked from commit 5a2086d230063b2f83a436ed37b0f6a92706bcb9)
---
 tools/firmware-utils/src/bcm4908img.c | 10 +++++++---
 1 file 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;
 	}