The run-reverse-sections-self.sh (which really should have been called
"swap-sections") could fail if the ELF file had sections that were not
directly next to each other swapped. Add a check to make sure the swapped
sections are actually directly next to each other.
Signed-off-by: Mark Wielaard <m...@klomp.org>
---
tests/ChangeLog | 5 +++++
tests/elfcopy.c | 1 +
2 files changed, 6 insertions(+)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index b4877db..e038793 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-03 Mark Wielaard <m...@klomp.org>
+
+ * elfcopy.c (copy_elf): When swapping the sh_offsets of two sections,
+ make sure they are actually next to each other.
+
2019-05-12 Mark Wielaard <m...@klomp.org>
* Makefile.am (check_PROGRAMS): Add elfrdwrnop.
diff --git a/tests/elfcopy.c b/tests/elfcopy.c
index d457bad..4542222 100644
--- a/tests/elfcopy.c
+++ b/tests/elfcopy.c
@@ -225,6 +225,7 @@ copy_elf (const char *in, const char *out, bool use_mmap,
bool reverse_offs)
&& shdr.sh_addralign == 1
&& last_shdr.sh_type != SHT_NOBITS
&& shdr.sh_type != SHT_NOBITS
+ && last_shdr.sh_offset + last_shdr.sh_size == shdr.sh_offset
&& (phnum == 0
|| ((shdr.sh_flags & SHF_ALLOC) == 0
&& (last_shdr.sh_flags & SHF_ALLOC) == 0)))
--
1.8.3.1
