aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--elf/dl-error.c2
-rw-r--r--elf/dl-open.c16
3 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a7ca357cf3..ee8a306eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-08 Jakub Jelinek <jakub@redhat.com>
+
+ * elf/dl-open.c (_dl_open): If objname points right after errstring,
+ allocate it together with errstring using alloca.
+ * elf/dl-error.c (_dl_signal_error): If malloc failed, set objname
+ to "", because it might point to local stack.
+
2000-12-05 H.J. Lu <hjl@gnu.org>
* nss/Makefile (routines): Add getnssent and getnssent_r.
diff --git a/elf/dl-error.c b/elf/dl-error.c
index 1c6de64275..83d984f045 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -88,7 +88,7 @@ _dl_signal_error (int errcode, const char *objname, const char *errstring)
else
{
/* This is better than nothing. */
- lcatch->objname = objname;
+ lcatch->objname = "";
lcatch->errstring = _dl_out_of_memory;
}
longjmp (lcatch->env, errcode ?: -1);
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 48bb9f82ed..90355796ba 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -391,6 +391,7 @@ _dl_open (const char *file, int mode, const void *caller)
{
/* Some error occurred during loading. */
char *local_errstring;
+ size_t len_errstring;
/* Remove the object from memory. It may be in an inconsistent
state if relocation failed, for example. */
@@ -399,7 +400,20 @@ _dl_open (const char *file, int mode, const void *caller)
/* Make a local copy of the error string so that we can release the
memory allocated for it. */
- local_errstring = strdupa (errstring);
+ 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);
+ objname = local_errstring + len_errstring;
+ }
+ else
+ {
+ local_errstring = alloca (len_errstring);
+ memcpy (local_errstring, errstring, len_errstring);
+ }
+
if (errstring != _dl_out_of_memory)
free ((char *) errstring);