diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-19 22:22:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-19 22:22:43 -0500 |
| commit | 6199ac5fbec7f8a862440a8b65f7f299de4c2dbf (patch) | |
| tree | 4bbb1629fde78b71981ec4205e65927023b3efea /src/common/log.c | |
| parent | a33b338c5bf5e40037f465c0257a70dedb095e82 (diff) | |
| download | tor-6199ac5fbec7f8a862440a8b65f7f299de4c2dbf.tar.gz tor-6199ac5fbec7f8a862440a8b65f7f299de4c2dbf.zip | |
Do not send Libevent log messages to a controller.
Doing so could make Libevent call Libevent from inside a Libevent
logging call, which is a recipe for reentrant confusion and
hard-to-debug crashes. This would especially hurt if Libevent
debug-level logging is enabled AND the user has a controller
watching for low-severity log messages.
Fix bug 2190; fix on 0.1.0.2-rc.
Diffstat (limited to 'src/common/log.c')
| -rw-r--r-- | src/common/log.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/log.c b/src/common/log.c index b639e7a781..0ccda53887 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -278,6 +278,10 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, lf = lf->next; continue; } + if (lf->callback && (domain & LD_NOCB)) { + lf = lf->next; + continue; + } if (lf->seems_dead) { lf = lf->next; continue; |