Skip to content

Commit 9b159d1

Browse files
committed
Merge 'fix-static-nif-init-assertion-failure' into maint
OTP-19443 PR-9307 GH-9306
2 parents 2190324 + a14c946 commit 9b159d1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: erts/emulator/beam/erl_nif.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -4437,7 +4437,8 @@ void erts_add_taint(Eterm mod_atom)
44374437
#endif
44384438
struct tainted_module_t *first, *t;
44394439

4440-
ERTS_LC_ASSERT(erts_lc_rwmtx_is_rwlocked(&erts_driver_list_lock)
4440+
ERTS_LC_ASSERT(!erts_initialized
4441+
|| erts_lc_rwmtx_is_rwlocked(&erts_driver_list_lock)
44414442
|| erts_has_code_mod_permission());
44424443

44434444
first = (struct tainted_module_t*) erts_atomic_read_nob(&first_taint);

0 commit comments

Comments
 (0)