From: Andreas Schwab Date: Mon, 25 Oct 2010 00:40:14 +0000 (-0400) Subject: Don't expand DST twice in dl_open X-Git-Tag: glibc-2.12.2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4279c4fbbb83f19ef96d64f4d5c56d329d33a25a;p=thirdparty%2Fglibc.git Don't expand DST twice in dl_open (cherry picked from commit 22cd1c9bcf57c5829d65b6da825f7a459d40c9eb) --- diff --git a/ChangeLog b/ChangeLog index 5031f63a49c..d1910d83e18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-18 Andreas Schwab + + * elf/dl-open.c (dl_open_worker): Don't expand DST here, let + _dl_map_object do it. + 2010-10-15 Andreas Schwab * scripts/data/localplt-s390-linux-gnu.data: New file. diff --git a/elf/dl-open.c b/elf/dl-open.c index 023b98ab790..cf8e8cc6715 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, lt_loaded, 0,