V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/image.c: Relocate strings in tables. 

Without this, u-boot can crash or print garbage if the original link
address no longer points to a valid string.

Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Scott Wood 2009-04-02 16:15:10 -05:00 committed by Wolfgang Denk
parent 3a671fc06a
commit e3d1ac7bb1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/image.c
View File

@ -518,7 +518,11 @@ static char *get_table_entry_name (table_entry_t *table, char *msg, int id)
{ {
for (; table->id >= 0; ++table) { for (; table->id >= 0; ++table) {
if (table->id == id) if (table->id == id)
return (table->lname); #ifdef USE_HOSTCC
return table->lname;
#else
return table->lname + gd->reloc_off;
#endif
} }
return (msg); return (msg);
} }
@ -579,7 +583,7 @@ static int get_table_entry_id (table_entry_t *table,
fprintf (stderr, "\n"); fprintf (stderr, "\n");
#else #else
for (t = table; t->id >= 0; ++t) { for (t = table; t->id >= 0; ++t) {
if (t->sname && strcmp(t->sname, name) == 0) if (t->sname && strcmp(t->sname + gd->reloc_off, name) == 0)
return (t->id); return (t->id);
} }
debug ("Invalid %s Type: %s\n", table_name, name); debug ("Invalid %s Type: %s\n", table_name, name);