* elf/dl-error.c (_dl_signal_error): When testing for executable
being relocated, take into account that nothing might even be loaded.
This commit is contained in:
parent
9f0d7b6df9
commit
587d6ddc60
|
@ -1,5 +1,8 @@
|
||||||
2005-07-06 Ulrich Drepper <drepper@redhat.com>
|
2005-07-06 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* elf/dl-error.c (_dl_signal_error): When testing for executable
|
||||||
|
being relocated, take into account that nothing might even be loaded.
|
||||||
|
|
||||||
* elf/dl-reloc.c [PROF] (_dl_relocate_object): Define
|
* elf/dl-reloc.c [PROF] (_dl_relocate_object): Define
|
||||||
consider_profiling always to zero. Don't count of compiler to
|
consider_profiling always to zero. Don't count of compiler to
|
||||||
remove unreached if block.
|
remove unreached if block.
|
||||||
|
|
|
@ -98,8 +98,9 @@ _dl_signal_error (int errcode, const char *objname, const char *occation,
|
||||||
/* If the main executable is relocated it means the libc's malloc
|
/* If the main executable is relocated it means the libc's malloc
|
||||||
is used. */
|
is used. */
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
lcatch->malloced = (GL(dl_ns)[LM_ID_BASE]._ns_loaded->l_relocated
|
lcatch->malloced = (GL(dl_ns)[LM_ID_BASE]._ns_loaded != NULL
|
||||||
!= 0);
|
&& (GL(dl_ns)[LM_ID_BASE]._ns_loaded->l_relocated
|
||||||
|
!= 0));
|
||||||
#else
|
#else
|
||||||
lcatch->malloced = true;
|
lcatch->malloced = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue