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!

diff --git a/changes/bug15245 b/changes/bug15245
new file mode 100644 (file)
index 0000000..520a370
--- /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 09ffdb81d10194b95d77d1fb9fc3dba71e136cd6..588eae9fc809f7ecdca5e0500cdd1797d95064ca 100644 (file)
--- 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,