sfos/ecl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fpe: fix ECL_WITH_LISP_FPE macro

Browse source 
We can't use ecl_process_env_unsafe() == NULL to check if ECL has
booted because the return value of ecl_process_env_unsafe is
unpredictable before ECL has booted. The reason is that
ecl_process_env_unsafe calls pthread_getspecific with an uninitialized
key stored in cl_env_key. But another call to pthread_setspecific
might have already registered a key which happens to be the same as
the not yet initialized cl_env_key, yielding a non-NULL value.
This commit is contained in:
Marius Gerbershagen 2020-06-28 11:02:15 +02:00
parent c1b5aee6de
commit 75877dd8f0
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/h/impl/math_fenv.h
View file

@ -72,15 +72,14 @@
#if defined(HAVE_FENV_H) && !defined(ECL_AVOID_FPE_H)
# if defined(HAVE_FEENABLEEXCEPT)
# define ECL_WITH_LISP_FPE_BEGIN do { \
fenv_t __fenv; \
fegetenv(&__fenv); \
cl_env_ptr __the_env = ecl_process_env_unsafe(); \
if (__the_env) { \
int bits = __the_env->trap_fpe_bits; \
fedisableexcept(FE_ALL_EXCEPT & ~bits); \
feenableexcept(FE_ALL_EXCEPT & bits); \
} \
# define ECL_WITH_LISP_FPE_BEGIN do { \
fenv_t __fenv; \
fegetenv(&__fenv); \
if (ecl_get_option(ECL_OPT_BOOTED) > 0) { \
int bits = ecl_process_env()->trap_fpe_bits; \
fedisableexcept(FE_ALL_EXCEPT & ~bits); \
feenableexcept(FE_ALL_EXCEPT & bits); \
} \
feclearexcept(FE_ALL_EXCEPT);
# else
# define ECL_WITH_LISP_FPE_BEGIN do { \