From 8d6292d9a070e87bf49d7d2894cd933795b9e3a8 Mon Sep 17 00:00:00 2001
From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 25 Jan 2008 18:09:21 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20incorrect=20elf=20segment=20size=20-=20?=
=?UTF-8?q?Thanks=20=C3=98yvind=20Harboe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
git-svn-id: svn://svn.berlios.de/openocd/trunk@277 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/target/image.c | 3 ++-
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 624f319e0..a457b567b 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 5c1f13c1c..f17a1c514 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;
--
GitLab