AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-11 20:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance _dl_catch_exception to allow disabling exception handling

Browse Source 
In some cases, it is necessary to introduce noexcept regions
where raised dynamic loader exceptions (e.g., from lazy binding)
are fatal, despite being nested in a code region with an active
exception handler.  This change enhances _dl_catch_exception with
to provide such a capability.  The existing function is reused,
so that it is not necessary to introduce yet another function with
a similar purpose.

Change-Id: Iec1bf642ff95a349fdde8040e9baf851ac7b8904
This commit is contained in:
Florian Weimer 2019-10-31 13:23:06 +01:00
parent 84df7a4637
commit 2a764c6ee8
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elf/dl-error-skeleton.c
View File

@ -173,6 +173,18 @@ int
_dl_catch_exception (struct dl_exception *exception,
void (*operate) (void *), void *args)
{
/* If exception is NULL, temporarily disable exception handling.
Exceptions during operate (args) are fatal. */
if (exception == NULL)
{
struct catch *const old = catch_hook;
catch_hook = NULL;
operate (args);
/* If we get here, the operation was successful. */
catch_hook = old;
return 0;
}
/* We need not handle `receiver' since setting a `catch' is handled
before it. */

4
sysdeps/generic/ldsodefs.h
View File

@ -861,7 +861,9 @@ libc_hidden_proto (_dl_catch_error)
/* Call OPERATE (ARGS). If no error occurs, set *EXCEPTION to zero.
Otherwise, store a copy of the raised exception in *EXCEPTION,
which has to be freed by _dl_exception_free. */
which has to be freed by _dl_exception_free. As a special case, if
EXCEPTION is null, call OPERATE (ARGS) with exception handling
disabled (so that exceptions are fatal). */
int _dl_catch_exception (struct dl_exception *exception,
void (*operate) (void *), void *args);
libc_hidden_proto (_dl_catch_exception)