diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-12 13:18:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-12 13:18:09 -0500 |
| commit | 7844c5ddd7d335f87af44fd3d0aba2becb0ab308 (patch) | |
| tree | 2d6a01bafca38ddfaa8bc81f5c3cc53501cd8fcb | |
| parent | ef0559c3e318f16e9617dd8176c86230efe67777 (diff) | |
| download | tor-7844c5ddd7d335f87af44fd3d0aba2becb0ab308.tar.gz tor-7844c5ddd7d335f87af44fd3d0aba2becb0ab308.zip | |
Have circuit_get_global_origin_circuit_list() return the right list. Bug 21118
| -rw-r--r-- | changes/bug21118 | 6 | ||||
| -rw-r--r-- | src/or/circuitlist.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug21118 b/changes/bug21118 new file mode 100644 index 0000000000..88e860c683 --- /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 2def522f17..c3e3e1e06e 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 */ |