From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26568 invoked by alias); 9 Mar 2011 18:00:44 -0000 Received: (qmail 26548 invoked by uid 22791); 9 Mar 2011 18:00:43 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 09 Mar 2011 18:00:38 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p29I0bm0001265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Mar 2011 13:00:37 -0500 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p29I0aSp007147 for ; Wed, 9 Mar 2011 13:00:36 -0500 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Don't leave empty element in rpath when skipping an element X-Yow: .. I don't understand the HUMOR of the THREE STOOGES!! Date: Mon, 14 Mar 2011 10:38:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-03/txt/msg00004.txt.bz2 2011-03-09 Andreas Schwab * elf/dl-load.c (_dl_dst_substitute): When skipping a path element also skip the colon. --- elf/dl-load.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index b19f72a..a474a0c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -284,6 +284,8 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, name += len; while (*name != '\0' && (!is_path || *name != ':')) ++name; + if (is_path && *name == ':') + ++name; } else /* No DST we recognize. */ -- 1.7.4 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."