summaryrefslogtreecommitdiff
path: root/src/or/cpuworker.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-12 11:13:57 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-12 11:14:39 -0400
commit66c81802076811cf2e329525a0fc9cb38a1e3608 (patch)
tree2c796da8cbfcad35676029947d1ec3f6ad8f1464 /src/or/cpuworker.c
parent354897a13e46cc06cb86eb1451a6d356d0402f42 (diff)
downloadtor-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!
Diffstat (limited to 'src/or/cpuworker.c')
-rw-r--r--src/or/cpuworker.c2
1 files changed, 2 insertions, 0 deletions
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,