diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 11:13:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 11:14:39 -0400 |
| commit | 66c81802076811cf2e329525a0fc9cb38a1e3608 (patch) | |
| tree | 2c796da8cbfcad35676029947d1ec3f6ad8f1464 | |
| parent | 354897a13e46cc06cb86eb1451a6d356d0402f42 (diff) | |
| download | tor-66c81802076811cf2e329525a0fc9cb38a1e3608.tar.gz tor-66c81802076811cf2e329525a0fc9cb38a1e3608.zip | |
Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
| -rw-r--r-- | changes/bug15245 | 5 | ||||
| -rw-r--r-- | src/or/cpuworker.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug15245 b/changes/bug15245 new file mode 100644 index 0000000000..520a370eeb --- /dev/null +++ b/changes/bug15245 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid crashing when making certain configuration option changes + on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported + by "anonym". + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 09ffdb81d1..588eae9fc8 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -178,6 +178,8 @@ update_state_threadfn(void *state_, void *work_) void cpuworkers_rotate_keyinfo(void) { + if (!threadpool) + return; if (threadpool_queue_update(threadpool, worker_state_new, update_state_threadfn, |