From da44fd6f994c601d30bf5896d03afd267feab37b Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Wed, 14 Sep 2011 12:19:30 +0000 Subject: sbtools: fix code to work with file larger than header indicated size git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30544 a1c6a512-1295-4272-9138-f99709370657 --- utils/sbtools/sbtoelf.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'utils/sbtools') diff --git a/utils/sbtools/sbtoelf.c b/utils/sbtools/sbtoelf.c index 50a23e56b3..9a06eade79 100644 --- a/utils/sbtools/sbtoelf.c +++ b/utils/sbtools/sbtoelf.c @@ -71,7 +71,6 @@ char BLUE[] = { 0x1b, 0x5b, 0x31, 0x3b, '3', '4', 0x6d, '\0' }; /* globals */ -size_t g_sz; /* file size */ uint8_t *g_buf; /* file content */ #define PREFIX_SIZE 128 char out_prefix[PREFIX_SIZE]; @@ -378,6 +377,14 @@ static void extract(unsigned long filesize) if(sb_header->sec_hdr_size * BLOCK_SIZE != sizeof(struct sb_section_header_t)) bugp("Bad section header size"); + if(filesize > sb_header->image_size * BLOCK_SIZE) + { + color(GREY); + printf("[Restrict file size from %lu to %d bytes]\n", filesize, + sb_header->image_size * BLOCK_SIZE); + filesize = sb_header->image_size * BLOCK_SIZE; + } + color(BLUE); printf("Basic info:\n"); color(GREEN); @@ -763,10 +770,9 @@ int main(int argc, const char **argv) if(fstat(fd, &st) == -1) bugp("firmware stat() failed"); - g_sz = st.st_size; - g_buf = xmalloc(g_sz); - if(read(fd, g_buf, g_sz) != (ssize_t)g_sz) /* load the whole file into memory */ + g_buf = xmalloc(st.st_size); + if(read(fd, g_buf, st.st_size) != (ssize_t)st.st_size) /* load the whole file into memory */ bugp("reading firmware"); close(fd); -- cgit v1.2.3