leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools: mkimage: Fix nullptr at strchr()

Browse Source 
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>
This commit is contained in:
Mikhail Ilin 2022-11-23 12:39:36 +03:00 committed by Tom Rini
parent 04e6332ec0
commit 17f8a74876
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/mkimage.c
View File

@ -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);