Skip to content
Snippets Groups Projects
Commit ea14fb13 authored by David Goulet's avatar David Goulet :panda_face:
Browse files

Merge branch 'tor-github/pr/1050' into maint-0.4.1

parents ce89fe36 5068ccab
No related branches found
No related tags found
No related merge requests found
o Minor features (logging):
- Give a more useful assertion failure message if we think we have
minherit() but we fail to make a region non-inheritable. Give a
compile-time warning if our support for minherit() is
incomplete. Closes ticket 30686.
......@@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed)
#else
/* We decided above that noinherit would always do _something_. Assert here
* that we were correct. */
tor_assert(inherit != INHERIT_RES_KEEP);
tor_assertf(inherit != INHERIT_RES_KEEP,
"We failed to create a non-inheritable memory region, even "
"though we believed such a failure to be impossible! This is "
"probably a bug in Tor support for your platform; please report "
"it.");
#endif /* defined(CHECK_PID) || ... */
return result;
}
......
......@@ -74,6 +74,11 @@
#endif /* defined(HAVE_MINHERIT) || ... */
#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT)
#warn "minherit() is defined, but we couldn't find the right flag for it."
#warn "This is probably a bug in Tor's support for this platform."
#endif
/**
* Helper: try to prevent the <b>sz</b> bytes at <b>mem</b> from being swapped
* to disk. Return 0 on success or if the facility is not available on this
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment