minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

"start" may be legitimately 0x0000

Browse Source
This commit is contained in:
wdenk 2003-09-19 08:29:25 +00:00
parent c3d98ed9ca
commit 1d70468b03
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/trab/auto_update.c
View File

@ -485,41 +485,45 @@ do_auto_update(void)
* now check whether start and end are defined using environment * now check whether start and end are defined using environment
* variables. * variables.
*/ */
start = end = 0; start = -1;
end = 0;
env = getenv("firmware_st"); env = getenv("firmware_st");
if (env != NULL) if (env != NULL)
start = simple_strtoul(env, NULL, 16); start = simple_strtoul(env, NULL, 16);
env = getenv("firmware_nd"); env = getenv("firmware_nd");
if (env != NULL) if (env != NULL)
end = simple_strtoul(env, NULL, 16); end = simple_strtoul(env, NULL, 16);
if (start && end && end > start) if (start >= 0 && end && end > start)
ausize[IDX_FIRMWARE] = (end + 1) - start; ausize[IDX_FIRMWARE] = (end + 1) - start;
start = end = 0; start = -1;
end = 0;
env = getenv("kernel_st"); env = getenv("kernel_st");
if (env != NULL) if (env != NULL)
start = simple_strtoul(env, NULL, 16); start = simple_strtoul(env, NULL, 16);
env = getenv("kernel_nd"); env = getenv("kernel_nd");
if (env != NULL) if (env != NULL)
end = simple_strtoul(env, NULL, 16); end = simple_strtoul(env, NULL, 16);
if (start && end && end > start) if (start >= 0 && end && end > start)
ausize[IDX_KERNEL] = (end + 1) - start; ausize[IDX_KERNEL] = (end + 1) - start;
start = end = 0; start = -1;
end = 0;
env = getenv("app_st"); env = getenv("app_st");
if (env != NULL) if (env != NULL)
start = simple_strtoul(env, NULL, 16); start = simple_strtoul(env, NULL, 16);
env = getenv("app_nd"); env = getenv("app_nd");
if (env != NULL) if (env != NULL)
end = simple_strtoul(env, NULL, 16); end = simple_strtoul(env, NULL, 16);
if (start && end && end > start) if (start >= 0 && end && end > start)
ausize[IDX_APP] = (end + 1) - start; ausize[IDX_APP] = (end + 1) - start;
start = end = 0; start = -1;
end = 0;
env = getenv("disk_st"); env = getenv("disk_st");
if (env != NULL) if (env != NULL)
start = simple_strtoul(env, NULL, 16); start = simple_strtoul(env, NULL, 16);
env = getenv("disk_nd"); env = getenv("disk_nd");
if (env != NULL) if (env != NULL)
end = simple_strtoul(env, NULL, 16); end = simple_strtoul(env, NULL, 16);
if (start && end && end > start) if (start >= 0 && end && end > start)
ausize[IDX_DISK] = (end + 1) - start; ausize[IDX_DISK] = (end + 1) - start;
/* make sure that we see CTRL-C and save the old state */ /* make sure that we see CTRL-C and save the old state */
old_ctrlc = disable_ctrlc(0); old_ctrlc = disable_ctrlc(0);