From 00ee369c1cbdcc4ca4a009e9223799951c6c8f04 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 3 May 2011 13:44:25 -0400 Subject: ldconfig: don't crash on empty path in config file --- elf/ldconfig.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'elf') diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 1b2eaa34d1..751b49bd43 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -384,14 +384,17 @@ add_dir (const char *line) } /* Canonify path: for now only remove leading and trailing - whitespace and the trailing slashes slashes. */ - i = strlen (entry->path) - 1; + whitespace and the trailing slashes. */ + i = strlen (entry->path); - while (isspace (entry->path[i]) && i > 0) - entry->path[i--] = '\0'; + while (i > 0 && isspace (entry->path[i - 1])) + entry->path[--i] = '\0'; - while (entry->path[i] == '/' && i > 0) - entry->path[i--] = '\0'; + while (i > 0 && entry->path[i - 1] == '/') + entry->path[--i] = '\0'; + + if (i == 0) + return; char *path = entry->path; if (opt_chroot) -- cgit 1.4.1