[tor-commits] [tor/master] Munmap the right pointers in routerlist_free()

[nickm at torproject.org]

commit 1a9b4bd28cf22e28d2c1b7b24a092d85c7c61139
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 31 11:43:11 2014 -0400

    Munmap the right pointers in routerlist_free()
---
 src/or/routerlist.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c96fb2c..44c6987 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2804,13 +2804,13 @@ routerlist_free(routerlist_t *rl)
                     signed_descriptor_free(sd));
   smartlist_free(rl->routers);
   smartlist_free(rl->old_routers);
-  if (routerlist->desc_store.mmap) {
+  if (rl->desc_store.mmap) {
     int res = tor_munmap_file(routerlist->desc_store.mmap);
     if (res != 0) {
       log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap");
     }
   }
-  if (routerlist->extrainfo_store.mmap) {
+  if (rl->extrainfo_store.mmap) {
     int res = tor_munmap_file(routerlist->extrainfo_store.mmap);
     if (res != 0) {
       log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap");