summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-28 08:24:07 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-28 08:24:07 +0000
commit88197030d5805d95d3e71d0aab71f44c6895b3b2 (patch)
treef25d4b4cc3579b52338c90b598b3daf8f82ceed3 /elf
parent94833f118b7b78a89595427c9d1a27f38084dbb9 (diff)
downloadglibc-88197030d5805d95d3e71d0aab71f44c6895b3b2.tar.gz
glibc-88197030d5805d95d3e71d0aab71f44c6895b3b2.tar.xz
glibc-88197030d5805d95d3e71d0aab71f44c6895b3b2.zip
[BZ #5222]
2007-10-28  Ulrich Drepper  <drepper@redhat.com>
	[BZ #5222]
	* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
	path elements in counting mode.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 98d25b827d..94531b271f 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2274,7 +2274,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
 	      if (counting)
 		{
 		  si->dls_cnt++;
-		  si->dls_size += r->dirnamelen < 2 ? r->dirnamelen : 2;
+		  si->dls_size += MAX (2, r->dirnamelen);
 		}
 	      else
 		{