From 984e9f0e4435afdd24edd3d83dff0145a2613821 Mon Sep 17 00:00:00 2001
From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 7 Mar 2008 16:38:02 +0000
Subject: [PATCH] - The elf loader incorrectly assumed that the program header
 always follows the ELF header. (Thanks Michael Bruck)

git-svn-id: svn://svn.berlios.de/openocd/trunk@472 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/target/image.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/target/image.c b/src/target/image.c
index 3fac05718..39df4aef1 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -381,6 +381,14 @@ int image_elf_read_headers(image_t *image)
 		return ERROR_IMAGE_FORMAT_ERROR;
 	}
 
+
+	if ((retval = fileio_seek(&elf->fileio, elf->header->e_phoff)) != ERROR_OK)
+	{
+		ERROR("cannot seek to ELF program header table, read failed");
+		return retval;
+	}
+
+
 	elf->segments = malloc(elf->segment_count*sizeof(Elf32_Phdr));
 
 	if ((retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr), (u8*)elf->segments, &read_bytes)) != ERROR_OK)
@@ -1001,3 +1009,4 @@ int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum)
 	return ERROR_OK;
 }
 
+