diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-25 18:09:21 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-25 18:09:21 +0000 |
| commit | 8d6292d9a070e87bf49d7d2894cd933795b9e3a8 (patch) | |
| tree | 7b70e7fb967eab5f9e48cd148ea8a2ac310836c8 /src | |
| parent | 080b2e3f2fc1402ad42574d73159721cde949f0c (diff) | |
| download | openocd+libswd-8d6292d9a070e87bf49d7d2894cd933795b9e3a8.tar.gz openocd+libswd-8d6292d9a070e87bf49d7d2894cd933795b9e3a8.tar.bz2 openocd+libswd-8d6292d9a070e87bf49d7d2894cd933795b9e3a8.tar.xz openocd+libswd-8d6292d9a070e87bf49d7d2894cd933795b9e3a8.zip | |
fixed incorrect elf segment size - Thanks Øyvind Harboe
git-svn-id: svn://svn.berlios.de/openocd/trunk@277 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/image.c | 3 | ||||
| -rw-r--r-- | src/target/target.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/target/image.c b/src/target/image.c index 624f319e..a457b567 100644 --- a/src/target/image.c +++ b/src/target/image.c @@ -411,7 +411,7 @@ int image_elf_read_headers(image_t *image) { if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) { - image->sections[j].size = field32(elf, elf->segments[i].p_memsz); + image->sections[j].size = field32(elf, elf->segments[i].p_filesz); image->sections[j].base_address = field32(elf, elf->segments[i].p_paddr); image->sections[j].private = &elf->segments[i]; image->sections[j].flags = field32(elf, elf->segments[i].p_flags); @@ -1027,3 +1027,4 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum) } + diff --git a/src/target/target.c b/src/target/target.c index 5c1f13c1..f17a1c51 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -781,7 +781,7 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) { buffer = malloc(size); - if (buffer==NULL) + if (buffer == NULL) { ERROR("error allocating buffer for section (%d bytes)", size); return ERROR_OK; @@ -1925,7 +1925,7 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch for (i = 0; i < image.num_sections; i++) { buffer = malloc(image.sections[i].size); - if (buffer==NULL) + if (buffer == NULL) { command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size); break; |