fixed incorrect elf segment size - Thanks Øyvind Harboe

git-svn-id: svn://svn.berlios.de/openocd/trunk@277 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/image.c b/src/target/image.c
index 624f319e058b3f2c7f455ba12f88bd7eca687223..a457b567b450bcc5521b427c87202a901908c37c 100644 (file)
--- 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 5c1f13c1cffe258fb88d433eba903b5ee71b8ac4..f17a1c514a27365c8fc2f8e429ab0aaadc8c7959 100644 (file)
--- 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;