The 'file' pointer can be null. Thus, before using it in the strchr() function, you need to make sure that it is not null.

Fixes: d1be8f922eb3 ("mkimage: Fix variable length header support") Signed-off-by: Mikhail Ilin ilin.mikhail.ol@gmail.com --- tools/mkimage.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/tools/mkimage.c b/tools/mkimage.c index 5f51d2cc89..95005d8414 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -509,6 +509,8 @@ int main(int argc, char **argv) file = params.datafile;

for (;;) { + if (!file) + break; char *sep = strchr(file, ':'); if (sep) { *sep = '\0';

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 --- tools/mkimage.c | 35 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/tools/mkimage.c b/tools/mkimage.c index 30c6df7708..0b68a29285 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -430,6 +430,24 @@ 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);