nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-04 12:05:51 -04:00
commit 1bb6e3b503
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/circuitlist.c
View File

@ -1334,6 +1334,11 @@ circuit_set_rend_token(or_circuit_t *circ, int is_rend_circ,
if (circ->rendinfo) if (circ->rendinfo)
circuit_clear_rend_token(circ); circuit_clear_rend_token(circ);
if (token == NULL) {
/* We were only trying to remove this token, not set a new one. */
return;
}
found_circ = digestmap_get(map, (const char *)token); found_circ = digestmap_get(map, (const char *)token);
if (found_circ) { if (found_circ) {
tor_assert(found_circ != circ); tor_assert(found_circ != circ);