28 lines
696 B
Diff
28 lines
696 B
Diff
|
2011-03-02 Andreas Schwab <schwab@redhat.com>
|
||
|
|
|
||
|
|
[BZ #12454]
|
||
|
|
* elf/dl-deps.c (_dl_map_object_deps): Don't try to sort
|
||
|
|
dependencies when there are none.
|
||
|
|
|
||
|
|
--- a/elf/dl-deps.c.orig 2011-05-25 16:42:39.000000000 +0200
|
||
|
|
+++ a/elf/dl-deps.c 2011-05-25 16:44:07.000000000 +0200
|
||
|
|
@@ -619,7 +619,8 @@
|
||
|
|
|
||
|
|
/* We can skip looking for the binary itself which is at the front
|
||
|
|
of the search list. */
|
||
|
|
- assert (nlist > 1);
|
||
|
|
+ if (nlist > 1)
|
||
|
|
+ {
|
||
|
|
i = 1;
|
||
|
|
bool seen[nlist];
|
||
|
|
memset (seen, false, nlist * sizeof (seen[0]));
|
||
|
|
@@ -669,7 +670,7 @@
|
||
|
|
|
||
|
|
next:;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ }
|
||
|
|
/* Terminate the list of dependencies. */
|
||
|
|
l_initfini[nlist] = NULL;
|
||
|
|
atomic_write_barrier ();
|