lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-10 05:03:06 +03:00
Code Activity

* elf/dl-load.c (_dl_map_object_from_fd): Move state change

Browse Source 
notification...
	(lose): ...to here.
This commit is contained in:
Ulrich Drepper
2006-04-30 23:47:30 +00:00
parent 846d1362cd
commit bca2218b9b
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2006-04-30 Ulrich Drepper <drepper@redhat.com> 2006-04-30 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_map_object_from_fd): Move state change
notification...
(lose): ...to here.
* posix/Makefile (tests): Add tst-getaddrinfo3. * posix/Makefile (tests): Add tst-getaddrinfo3.
* posix/tst-getaddrinfo3.c: New file. * posix/tst-getaddrinfo3.c: New file.

23
elf/dl-load.c
View File

@@ -1,6 +1,5 @@
/* Map in a shared object's segments from the file. /* Map in a shared object's segments from the file.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc.
2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -786,7 +785,7 @@ _dl_init_paths (const char *llp)
static void static void
__attribute__ ((noreturn, noinline)) __attribute__ ((noreturn, noinline))
lose (int code, int fd, const char *name, char *realname, struct link_map *l, lose (int code, int fd, const char *name, char *realname, struct link_map *l,
const char *msg) const char *msg, struct r_debug *r)
{ {
/* The file might already be closed. */ /* The file might already be closed. */
if (fd != -1) if (fd != -1)
@@ -805,6 +804,13 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l,
free (l); free (l);
} }
free (realname); free (realname);
if (r != NULL)
{
r->r_state = RT_CONSISTENT;
_dl_debug_state ();
}
_dl_signal_error (code, name, NULL, msg); _dl_signal_error (code, name, NULL, msg);
} }
@@ -840,13 +846,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
call_lose_errno: call_lose_errno:
errval = errno; errval = errno;
call_lose: call_lose:
if (make_consistent) lose (errval, fd, name, realname, l, errstring,
{ make_consistent ? r : NULL);
r->r_state = RT_CONSISTENT;
_dl_debug_state ();
}
lose (errval, fd, name, realname, l, errstring);
} }
/* Look again to see if the real name matched another already loaded. */ /* Look again to see if the real name matched another already loaded. */
@@ -1642,7 +1643,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
name = strdupa (realname); name = strdupa (realname);
free (realname); free (realname);
} }
lose (errval, fd, name, NULL, NULL, errstring); lose (errval, fd, name, NULL, NULL, errstring, NULL);
} }
/* See whether the ELF header is what we expect. */ /* See whether the ELF header is what we expect. */