auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fileio: fileio_size() can now fail

Browse Source 
Part of making the fileio API more robust.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-09-29 09:11:01 +02:00
parent 3a693ef526
commit 3931b99d14
9 changed files with 92 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/target/etm.c
View File

@@ -1897,7 +1897,15 @@ COMMAND_HANDLER(handle_etm_load_command)
return ERROR_FAIL;
}
if (fileio_size(&file) % 4)
int filesize;
int retval = fileio_size(&file, &filesize);
if (retval != ERROR_OK)
{
fileio_close(&file);
return retval;
}
if (filesize % 4)
{
command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
fileio_close(&file);

25
src/target/image.c
View File

@@ -158,7 +158,13 @@ static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
ihex->buffer = malloc(fileio_size(fileio) >> 1);
int filesize;
int retval;
retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK)
return retval;
ihex->buffer = malloc(filesize >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &ihex->buffer[cooked_bytes];
@@ -537,7 +543,13 @@ static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */
mot->buffer = malloc(fileio_size(fileio) >> 1);
int retval;
int filesize;
retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK)
return retval;
mot->buffer = malloc(filesize >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &mot->buffer[cooked_bytes];
@@ -743,11 +755,18 @@ int image_open(struct image *image, const char *url, const char *type_string)
{
return retval;
}
int filesize;
retval = fileio_size(&image_binary->fileio, &filesize);
if (retval != ERROR_OK)
{
fileio_close(&image_binary->fileio);
return retval;
}
image->num_sections = 1;
image->sections = malloc(sizeof(struct imagesection));
image->sections[0].base_address = 0x0;
image->sections[0].size = fileio_size(&image_binary->fileio);
image->sections[0].size = filesize;
image->sections[0].flags = 0;
}
else if (image->type == IMAGE_IHEX)

8
src/target/target.c
View File

@@ -2648,9 +2648,13 @@ COMMAND_HANDLER(handle_dump_image_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
int filesize;
retval = fileio_size(&fileio, &filesize);
if (retval != ERROR_OK)
return retval;
command_print(CMD_CTX,
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio_size(&fileio),
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)filesize,
duration_elapsed(&bench), duration_kbps(&bench, filesize));
}
return retval;