diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-11-16 18:25:20 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-11-16 18:25:20 +0000 |
| commit | 0fa698d84fc6f3f6b71ecb1a7b9acb8de7e0d16a (patch) | |
| tree | 77457b4c398934f0895d4edbdeed80f4f1390d07 | |
| parent | b4a90cfb7fcbc2e621d08ef3993f7912a8b4867c (diff) | |
| download | tor-0fa698d84fc6f3f6b71ecb1a7b9acb8de7e0d16a.tar tor-0fa698d84fc6f3f6b71ecb1a7b9acb8de7e0d16a.tar.gz | |
apply sebastian's bug 867 fix: make routerset_equal() work as documented with NULL arguments
svn:r17287
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -11,7 +11,9 @@ Changes in version 0.2.1.8-alpha - 2008-??-?? - Made Tor a little less aggressive about deleting expired certificates. Partial fix for bug 854. - Stop doing unaligned memory access that generated bus errors on - sparc64. Fix for bug 862. + sparc64. Bugfix on 0.2.0.10-alpha. Fix for bug 862. + - Fix a crash bug when changing ExcludeNodes from the controller. Bugfix + on 0.2.1.6-alpha. Fix for bug 867. Patched by Sebastian. o Minor features (controller): - Return circuit purposes in response to GETINFO circuit-status. Fixes diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a46f0fb67..48e66ed8d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5100,6 +5100,11 @@ routerset_to_string(const routerset_t *set) int routerset_equal(const routerset_t *old, const routerset_t *new) { + if (old == NULL && new == NULL) + return 1; + else if (old == NULL || new == NULL) + return 0; + if (smartlist_len(old->list) != smartlist_len(new->list)) return 0; |