* elf/dl-load.c (lose): Decrement _nl_loaded.
	(_dl_map_object_from_fd): Don't try to dlopen executables.
This commit is contained in:
Ulrich Drepper 2000-09-08 05:49:02 +00:00
parent 63e18f77e2
commit 48da109259
2 changed files with 11 additions and 0 deletions

View file

@ -1,5 +1,8 @@
2000-09-07 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (lose): Decrement _nl_loaded.
(_dl_map_object_from_fd): Don't try to dlopen executables.
* iconvdata/tst-tables.sh: Actually return with an error if
something goes wrong.
* iconvdata/tst-table.sh: Return with an error if any of the cmp fails.

View file

@ -709,6 +709,7 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l,
l->l_prev->l_next = l->l_next;
if (l->l_next)
l->l_next->l_prev = l->l_prev;
--_dl_nloaded;
free (l);
}
free (realname);
@ -997,6 +998,13 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
}
else
{
/* This object is loaded at a fixed address. This must never
happen for objects loaded with dlopen(). */
if (mode & __RTLD_DLOPEN)
{
LOSE (0, N_("cannot dynamically load executable"));
}
/* Notify ELF_PREFERRED_ADDRESS that we have to load this one
fixed. */
ELF_FIXED_ADDRESS (loader, c->mapstart);