aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-03 06:18:49 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-03 06:18:49 +0000
commit8693ad52d977cfde85bcd104a7f47dae6fe36c0b (patch)
treebfe3cccd84c9e226239787efc9887dadd2349768
parent3384a8d67c2e46701356623fdd0a56f3b0734865 (diff)
downloadglibc-8693ad52d977cfde85bcd104a7f47dae6fe36c0b.tar
glibc-8693ad52d977cfde85bcd104a7f47dae6fe36c0b.tar.gz
glibc-8693ad52d977cfde85bcd104a7f47dae6fe36c0b.tar.bz2
glibc-8693ad52d977cfde85bcd104a7f47dae6fe36c0b.zip
Update.
* elf/dl-deps.c (_dl_map_object_deps): The sorting of the dependencies must be stable to work correctly. Reported by martin.lubich@datacon.at.
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-deps.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d7e9df2efe..49cad44081 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2002-04-02 Ulrich Drepper <drepper@redhat.com>
+ * elf/dl-deps.c (_dl_map_object_deps): The sorting of the
+ dependencies must be stable to work correctly.
+ Reported by martin.lubich@datacon.at.
+
* libio/bug-ungetwc1.c: New file.
* libio/Makefile (tests): Add bug-ungetwc1.
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 6dac54ab23..9fd2dd23ef 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -614,6 +614,10 @@ Filters not supported with LD_TRACE_PRELINKING"));
(k - j) * sizeof (struct link_map *));
map->l_initfini[j] = here;
+ /* Don't insert further matches before the last
+ entry moved to the front. */
+ ++j;
+
break;
}
}