devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

sbtools: various fixes

Browse source 
Change-Id: I82c4642aea325cf22d66e9b49fc2d47319cd70eb
This commit is contained in:
Amaury Pouly 2013-08-04 21:31:54 +02:00
parent e69293ecdb
commit 8e69c37b5a
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
utils/imxtools/sbtools/elf.c
View file

@ -733,7 +733,10 @@ bool elf_read_file(struct elf_params_t *params, elf_read_fn_t read,
sym->name = strdup(&symstrtab[symdata[j].st_name]); sym->name = strdup(&symstrtab[symdata[j].st_name]);
sym->addr = symdata[j].st_value; sym->addr = symdata[j].st_value;
sym->size = symdata[j].st_size; sym->size = symdata[j].st_size;
sym->section = strdup(&strtab[shdr[symdata[j].st_shndx].sh_name]); if(symdata[j].st_shndx == SHN_ABS)
sym->section = NULL;
else
sym->section = strdup(&strtab[shdr[symdata[j].st_shndx].sh_name]);
switch(type) switch(type)
{ {
case STT_FUNC: sym->type = ESYT_FUNC; break; case STT_FUNC: sym->type = ESYT_FUNC; break;

2
utils/imxtools/sbtools/misc.c
View file

@ -308,7 +308,7 @@ void color(color_t c)
enum sb_version_guess_t guess_sb_version(const char *filename) enum sb_version_guess_t guess_sb_version(const char *filename)
{ {
#define ret(x) do { fclose(f); return x; } while(0) #define ret(x) do { if(f) fclose(f); return x; } while(0)
FILE *f = fopen(filename, "rb"); FILE *f = fopen(filename, "rb");
if(f == NULL) if(f == NULL)
ret(SB_VERSION_ERR); ret(SB_VERSION_ERR);