[tor-commits] [tor/master] Have circuit_get_global_origin_circuit_list() return the right list. Bug 21118

[nickm at torproject.org]

commit 7844c5ddd7d335f87af44fd3d0aba2becb0ab308
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 12 13:18:09 2017 -0500

    Have circuit_get_global_origin_circuit_list() return the right list. Bug 21118
---
 changes/bug21118     | 6 ++++++
 src/or/circuitlist.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changes/bug21118 b/changes/bug21118
new file mode 100644
index 0000000..88e860c
--- /dev/null
+++ b/changes/bug21118
@@ -0,0 +1,6 @@
+  o Major bugfixes (client, guard, crash):
+    - In circuit_get_global_origin_list(), return the actual list of
+      origin circuits. The previous version of this code returned
+      the list of all the circuits, and could have caused strange bugs,
+      including possible crashes.  Fixes bug 21118; bugfix on 0.3.0.1-alpha.
+
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 2def522..c3e3e1e 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -591,7 +591,7 @@ circuit_get_global_origin_circuit_list(void)
 {
   if (NULL == global_origin_circuit_list)
     global_origin_circuit_list = smartlist_new();
-  return global_circuitlist;
+  return global_origin_circuit_list;
 }
 
 /** Function to make circ-\>state human-readable */