From: Mikhail Ilin <ilin.mikhail.ol@gmail.com>
Date: Wed, 23 Nov 2022 09:39:36 +0000 (+0300)
Subject: tools: mkimage: Fix nullptr at strchr()
X-Git-Tag: v2025.01-rc5-pxa1908~1158^2~11^2~7
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=17f8a7487689ad727aadc00c14cd3315cd880e4a;p=u-boot.git

tools: mkimage: Fix nullptr at strchr()

The copy_datafile(ifd, params.datafile) function has been
 implemented to copy data by reducing the number of lines in the main
 function.

Signed-off-by: Mikhail Ilin <ilin.mikhail.ol@gmail.com>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index 30c6df7708..0b5ee5da1e 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -430,6 +430,25 @@ static void verify_image(const struct image_type_params *tparams)
 	(void)close(ifd);
 }
 
+void copy_datafile(int ifd, char *file)
+{
+	if (!file)
+		return;
+	for (;;) {
+		char *sep = strchr(file, ':');
+
+		if (sep) {
+			*sep = '\0';
+			copy_file(ifd, file, 1);
+			*sep++ = ':';
+			file = sep;
+		} else {
+			copy_file(ifd, file, 0);
+			break;
+		}
+	}
+}
+
 int main(int argc, char **argv)
 {
 	int ifd = -1;
@@ -647,21 +666,7 @@ int main(int argc, char **argv)
 					file = NULL;
 				}
 			}
-
-			file = params.datafile;
-
-			for (;;) {
-				char *sep = strchr(file, ':');
-				if (sep) {
-					*sep = '\0';
-					copy_file (ifd, file, 1);
-					*sep++ = ':';
-					file = sep;
-				} else {
-					copy_file (ifd, file, 0);
-					break;
-				}
-			}
+			copy_datafile(ifd, params.datafile);
 		} else if (params.type == IH_TYPE_PBLIMAGE) {
 			/* PBL has special Image format, implements its' own */
 			pbl_load_uboot(ifd, &params);