diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-20 10:10:54 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-20 10:10:54 +0000 |
| commit | 0485363c457fd42f38e94ee6b7190c89a4aa762f (patch) | |
| tree | 0816f27dc3751362b13bc08e3c0580173eb1f0cb /src/target/image.c | |
| parent | 0989c374e91fb7c743c8f791e55fcca935351e9d (diff) | |
| download | openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.gz openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.bz2 openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.xz openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.zip | |
Edgar Grimberg fixes some memory handling issues and
a problem with arm7_9_debug_entry not executing a code path upon crashes.
git-svn-id: svn://svn.berlios.de/openocd/trunk@669 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/image.c')
| -rw-r--r-- | src/target/image.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/target/image.c b/src/target/image.c index 72a3828c..16f32867 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -347,6 +347,12 @@ int image_elf_read_headers(image_t *image) elf->header = malloc(sizeof(Elf32_Ehdr)); + if(elf->header == NULL) + { + LOG_ERROR("insufficient memory to perform operation "); + return ERROR_FILEIO_OPERATION_FAILED; + } + if ((retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (u8*)elf->header, &read_bytes)) != ERROR_OK) { LOG_ERROR("cannot read ELF file header, read failed"); @@ -392,6 +398,11 @@ int image_elf_read_headers(image_t *image) } elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr)); + if(elf->segments == NULL) + { + LOG_ERROR("insufficient memory to perform operation "); + return ERROR_FILEIO_OPERATION_FAILED; + } if ((retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK) { |