From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Mar 2015 15:13:57 +0000 (-0400)
Subject: Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
X-Git-Tag: tor-0.2.6.5-rc~7^2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66c81802076811cf2e329525a0fc9cb38a1e3608;p=thirdparty%2Ftor.git

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
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,