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

svn:r17287

diff --git a/ChangeLog b/ChangeLog
index cc68082edb26fe65e5dc720211f138fe47f5b56b..b99d5ed06e3e93e3c1c301ab15cb5ef3366896fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a46f0fb675ffd9de71ea1004df4c646dbe47acca..48e66ed8db007ae489db7fc990b5240ffcb9f10e 100644 (file)
--- 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;