From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 31 Mar 2014 15:43:11 +0000 (-0400)
Subject: Munmap the right pointers in routerlist_free()
X-Git-Tag: tor-0.2.5.4-alpha~86^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a9b4bd28cf22e28d2c1b7b24a092d85c7c61139;p=thirdparty%2Ftor.git

Munmap the right pointers in routerlist_free()
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c96fb2c11d..44c698738a 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");