diff options
| author | Ulf Hermann <[email protected]> | 2017-04-07 15:57:45 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2017-04-26 14:32:18 +0000 |
| commit | b9e2d78403173c35c1d8e31ef2e249f311b5e9dd (patch) | |
| tree | 34eff6920338d2226bff066f5b0f77b6666b7dba | |
| parent | bb8bd71deb85ce7818fa747c3297d4b0ed7cf367 (diff) | |
Make elf section sorting more deterministic
At least one test (dwfl-addr-sect) depends on the order of elf sections
with equal addresses. This is not guaranteed by the code. Compare also
by end address and name to tell entries apart.
Change-Id: I0e85e7b86a0489b6bc85f45f9a359c68a04f635a
Reviewed-by: Christian Kandeler <[email protected]>
| -rw-r--r-- | libdwfl/ChangeLog | 5 | ||||
| -rw-r--r-- | libdwfl/derelocate.c | 17 | ||||
| -rw-r--r-- | tests/ChangeLog | 6 | ||||
| -rwxr-xr-x | tests/run-dwfl-addr-sect.sh | 2 |
4 files changed, 23 insertions, 7 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index f605f466..a1ed675d 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,5 +1,10 @@ 2017-04-20 Ulf Hermann <[email protected]> + * derelocate.c (compare_secrefs): Compare by end address and then by + name if start addresses are equal. + +2017-04-20 Ulf Hermann <[email protected]> + * elf-from-memory.c: Explicitly cast phnum to size_t. 2017-04-20 Ulf Hermann <[email protected]> diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c index e5c3e12e..8d965af9 100644 --- a/libdwfl/derelocate.c +++ b/libdwfl/derelocate.c @@ -57,17 +57,22 @@ struct secref static int compare_secrefs (const void *a, const void *b) { - struct secref *const *p1 = a; - struct secref *const *p2 = b; + struct secref const *p1 = *(struct secref *const *)a; + struct secref const *p2 = *(struct secref *const *)b; /* No signed difference calculation is correct here, since the terms are unsigned and could be more than INT64_MAX apart. */ - if ((*p1)->start < (*p2)->start) + if (p1->start < p2->start) return -1; - if ((*p1)->start > (*p2)->start) + if (p1->start > p2->start) return 1; - - return 0; + if (p1->end < p2->end) + return -1; + if (p1->end > p2->end) + return 1; + if (p1->name == NULL) + return p2->name == NULL ? 0 : -1; + return p2->name == NULL ? 1 : strcmp(p1->name, p2->name); } static int diff --git a/tests/ChangeLog b/tests/ChangeLog index c4e76d15..74d7c9a1 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2017-04-20 Ulf Hermann <[email protected]> + + * run-dwfl-addr-sect.sh: Expect section with alphabetically smaller + name when requesting the start address of two otherwise equal + zero-sized sections. + 2017-04-20 Ulf Hermann <[email protected]> * run-readelf-dwz-multi.sh: Expect readelf to output "yes" for flags diff --git a/tests/run-dwfl-addr-sect.sh b/tests/run-dwfl-addr-sect.sh index 80da0081..e257bfc0 100755 --- a/tests/run-dwfl-addr-sect.sh +++ b/tests/run-dwfl-addr-sect.sh @@ -20,7 +20,7 @@ testfiles testfile43 testfile50 testrun_compare ${abs_builddir}/dwfl-addr-sect -e testfile43 0x64 0x8 0x98 <<\EOF -address 0x64 => module "" section 4 + 0 +address 0x64 => module "" section 3 + 0 address 0x8 => module "" section 1 + 0x8 address 0x98 => module "" section 7 + 0 EOF |