aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-10-24 20:40:14 -0400
committerUlrich Drepper <drepper@redhat.com>2010-10-24 20:40:14 -0400
commit22cd1c9bcf57c5829d65b6da825f7a459d40c9eb (patch)
treeb30eb68bf09d553bcf61e8b8720798de0befc84f
parent18edac4857531b4b034eef37a07e3b03117de2bf (diff)
downloadglibc-22cd1c9bcf57c5829d65b6da825f7a459d40c9eb.tar
glibc-22cd1c9bcf57c5829d65b6da825f7a459d40c9eb.tar.gz
glibc-22cd1c9bcf57c5829d65b6da825f7a459d40c9eb.tar.bz2
glibc-22cd1c9bcf57c5829d65b6da825f7a459d40c9eb.zip
Don't expand DST twice in dl_open
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-open.c29
2 files changed, 5 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index e162666af7..f3735a9d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-18 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dl-open.c (dl_open_worker): Don't expand DST here, let
+ _dl_map_object do it.
+
2010-10-19 Ulrich Drepper <drepper@gmail.com>
* sysdeps/i386/bits/mathdef.h (FP_FAST_FMA): If the GCC 4.6 port has
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 754a263fa1..c394b3f764 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -221,35 +221,6 @@ dl_open_worker (void *a)
assert (_dl_debug_initialize (0, args->nsid)->r_state == RT_CONSISTENT);
- /* Maybe we have to expand a DST. */
- if (__builtin_expect (dst != NULL, 0))
- {
- size_t len = strlen (file);
-
- /* Determine how much space we need. We have to allocate the
- memory locally. */
- size_t required = DL_DST_REQUIRED (call_map, file, len,
- _dl_dst_count (dst, 0));
-
- /* Get space for the new file name. */
- char *new_file = (char *) alloca (required + 1);
-
- /* Generate the new file name. */
- _dl_dst_substitute (call_map, file, new_file, 0);
-
- /* If the substitution failed don't try to load. */
- if (*new_file == '\0')
- _dl_signal_error (0, "dlopen", NULL,
- N_("empty dynamic string token substitution"));
-
- /* Now we have a new file name. */
- file = new_file;
-
- /* It does not matter whether call_map is set even if we
- computed it only because of the DST. Since the path contains
- a slash the value is not used. See dl-load.c. */
- }
-
/* Load the named object. */
struct link_map *new;
args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,