Update.

1998-09-02  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-load.c (fillin_rpath): Handle "/" as RPATH correctly.
	(_dl_map_object_from_fd): Make NAME argument const.
	Remove last parameter in _dl_new_object call.
	(print_search_path): Correct construction of composed path name.
	(_dl_map_object): Prevent looking at RPATH of the main map twice.
	Remove last parameter in _dl_new_object call.
	* elf/dl-object.c: Remove last parameter.  Determine whether create
	origin entry based on empty realname.  Handle file in root directory
	correctly.
	* elf/ldsodefs.h: Adjust prototype for _dl_new_object.
	* elf/rtld.c (dl_main): Add comment describing reason for memory leak.
	Remove last parameter in _dl_new_object call.
	* sysdeps/generic/dl-origin.h: Handle file in root directory correctly.
	* sysdeps/unix/sysv/linux/dl-origin.h: Likewise.

1 files changed, 4 insertions, 2 deletions

diff --git a/sysdeps/unix/sysv/linux/dl-origin.h b/sysdeps/unix/sysv/linux/dl-origin.h
index f5a92379db..5654b42a2f 100644
--- a/sysdeps/unix/sysv/linux/dl-origin.h
+++ b/sysdeps/unix/sysv/linux/dl-origin.h
@@ -37,13 +37,15 @@ get_origin (void)
       result = (char *) malloc (last_slash - linkval + 1);
       if (result == NULL)
 	result = (char *) -1;
+      else if (last_slash == linkval)
+	memcpy (result, "/", 2);
       else
 	*((char *) __mempcpy (result, linkval, last_slash - linkval)) = '\0';
     }
   else
     {
       result = (char *) -1;
-      /* We use te environment variable LD_ORIGIN_PATH.  If it is set make
+      /* We use the environment variable LD_ORIGIN_PATH.  If it is set make
 	 a copy and strip out trailing slashes.  */
       if (_dl_origin_path != NULL)
 	{
@@ -54,7 +56,7 @@ get_origin (void)
 	  else
 	    {
 	      char *cp = __mempcpy (result, _dl_origin_path, len);
-	      while (cp > result && cp[-1] == '/')
+	      while (cp > result + 1 && cp[-1] == '/')
 		--cp;
 	      *cp = '\0';
 	    }