apply sebastian's bug 867 fix: make routerset_equal() work as documented with NULL arguments

svn:r17287
This commit is contained in:
Nick Mathewson 2008-11-16 18:25:20 +00:00
parent b4a90cfb7f
commit 0fa698d84f
2 changed files with 8 additions and 1 deletions

View File

@ -11,7 +11,9 @@ Changes in version 0.2.1.8-alpha - 2008-??-??
- Made Tor a little less aggressive about deleting expired certificates. - Made Tor a little less aggressive about deleting expired certificates.
Partial fix for bug 854. Partial fix for bug 854.
- Stop doing unaligned memory access that generated bus errors on - 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): o Minor features (controller):
- Return circuit purposes in response to GETINFO circuit-status. Fixes - Return circuit purposes in response to GETINFO circuit-status. Fixes

View File

@ -5100,6 +5100,11 @@ routerset_to_string(const routerset_t *set)
int int
routerset_equal(const routerset_t *old, const routerset_t *new) 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)) if (smartlist_len(old->list) != smartlist_len(new->list))
return 0; return 0;