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

mkimxboot: fix crash

Browse source 
I was too aggressive when converting reads to standard reads, this
one is memory based and not file based

Change-Id: Ibe7162894cc44cbd79f56cafe7136bda0f76bcdc
This commit is contained in:
Amaury Pouly 2013-08-22 17:49:50 +02:00
parent acaedfdb89
commit a2d4a4a560
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rbutil/mkimxboot/mkimxboot.c
View file

@ -604,6 +604,18 @@ struct elf_user_t
size_t sz; size_t sz;
}; };
static bool elf_read(void *user, uint32_t addr, void *buf, size_t count)
{
struct elf_user_t *u = user;
if(addr + count <= u->sz)
{
memcpy(buf, u->buf + addr, count);
return true;
}
else
return false;
}
/* Load a rockbox firwmare from a buffer. Data is copied. Assume firmware is /* Load a rockbox firwmare from a buffer. Data is copied. Assume firmware is
* using ELF format. */ * using ELF format. */
static enum imx_error_t rb_fw_load_buf_elf(struct rb_fw_t *fw, uint8_t *buf, static enum imx_error_t rb_fw_load_buf_elf(struct rb_fw_t *fw, uint8_t *buf,
@ -614,7 +626,7 @@ static enum imx_error_t rb_fw_load_buf_elf(struct rb_fw_t *fw, uint8_t *buf,
user.buf = buf; user.buf = buf;
user.sz = sz; user.sz = sz;
elf_init(&elf); elf_init(&elf);
if(!elf_read_file(&elf, elf_std_read, generic_std_printf, &user)) if(!elf_read_file(&elf, elf_read, generic_std_printf, &user))
{ {
elf_release(&elf); elf_release(&elf);
printf("[ERR] Error parsing ELF file\n"); printf("[ERR] Error parsing ELF file\n");