Skip to content
Snippets Groups Projects
Commit f07217c9 authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Fix array overflow with fw_setenv on uninitialised environment

Patch by Murray Jensen, 15 Jul 2005
parent 84c960ce
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
* Fix array overflow with fw_setenv on uninitialised environment
Patch by Murray Jensen, 15 Jul 2005
* Add support for EmbeddedPlanet EP88x boards
Patch by Yuli Barcohen, 13 Jul 2005
......
......@@ -614,8 +614,7 @@ static int env_init (void)
if (!crc1_ok) {
fprintf (stderr,
"Warning: Bad CRC, using default environment\n");
environment.data = default_environment;
free (addr1);
memcpy(environment.data, default_environment, sizeof default_environment);
}
} else {
flag1 = environment.flags;
......@@ -652,9 +651,8 @@ static int env_init (void)
} else if (!crc1_ok && !crc2_ok) {
fprintf (stderr,
"Warning: Bad CRC, using default environment\n");
environment.data = default_environment;
memcpy(environment.data, default_environment, sizeof default_environment);
curdev = 0;
free (addr2);
free (addr1);
} else if (flag1 == active_flag && flag2 == obsolete_flag) {
environment.data = addr1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment