[tor-commits] [tor/maint-0.2.6] Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.

[nickm@xxxxxxxxxxxxxx]

commit 66c81802076811cf2e329525a0fc9cb38a1e3608
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Mar 12 11:13:57 2015 -0400

    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!
---
 changes/bug15245   |    5 +++++
 src/or/cpuworker.c |    2 ++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug15245 b/changes/bug15245
new file mode 100644
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 09ffdb8..588eae9 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,



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits