diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-31 19:17:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-31 19:17:22 -0400 |
| commit | 77ffd6b2a7bb8450c033763e2eb4d7f0ed7a5757 (patch) | |
| tree | b7578a5b8c4c86909b9f63546b6d557a2782823a /src/or/control.c | |
| parent | e84ddead349e5af8c183042d3de27ecb4b6d4e87 (diff) | |
| parent | c4c7dcd453b62b3d3bcc8e78df8455a77645e62a (diff) | |
| download | tor-77ffd6b2a7bb8450c033763e2eb4d7f0ed7a5757.tar.gz tor-77ffd6b2a7bb8450c033763e2eb4d7f0ed7a5757.zip | |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index 2052b967c7..e2ab9f31c5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3230,6 +3230,11 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg) { int event; + /* Don't even think of trying to add stuff to a buffer from a cpuworker + * thread. */ + if (! in_main_thread()) + return; + if (disable_log_messages) return; |