Update.

2000-12-27  Ben Collins  <bcollins@debian.org>

	* elf/dl-open.c (_dl_open): Correctly set the new objname pointer
	when reallocating the error strings.
	Reported by Kalle Olavi Niemitalo <kon@iki.fi>

diff --git a/ChangeLog b/ChangeLog
index 6cc3f21e987462c5fd89faeb54d50047c1cddeae..ead33bacc35a9b5ca00527d3992671ea73c177f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-27  Ben Collins  <bcollins@debian.org>
+
+       * elf/dl-open.c (_dl_open): Correctly set the new objname pointer
+       when reallocating the error strings.
+       Reported by Kalle Olavi Niemitalo <kon@iki.fi>
+
 2000-12-27  Ulrich Drepper  <drepper@redhat.com>
 
        * dlfcn/Makefile (tests): Add errmsg1.

diff --git a/elf/dl-open.c b/elf/dl-open.c
index 90355796ba6dec9c4d59dd258a28146dafacd36f..931e22625c2d0a3042a7d1abbb44661ebc5fa90a 100644 (file)
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -403,9 +403,9 @@ _dl_open (const char *file, int mode, const void *caller)
       len_errstring = strlen (errstring) + 1;
       if (objname == errstring + len_errstring)
        {
-         len_errstring += strlen (objname) + 1;
-         local_errstring = alloca (len_errstring);
-         memcpy (local_errstring, errstring, len_errstring);
+         size_t total_len = len_errstring + strlen (objname) + 1;
+         local_errstring = alloca (total_len);
+         memcpy (local_errstring, errstring, total_len);
          objname = local_errstring + len_errstring;
        }
       else