diff options
| author | teor <teor@torproject.org> | 2019-08-30 23:24:05 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-30 23:24:05 +1000 |
| commit | 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e (patch) | |
| tree | 1cf10af98db9150044068bd50cbcbe1a982e0510 | |
| parent | b66712d85b5eb6a95db8d28a678ab8dd1baec19b (diff) | |
| parent | a9379d6750d025d8bfe54a79c26e89eb45393f3a (diff) | |
| download | tor-1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e.tar.gz tor-1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e.zip | |
Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5
| -rw-r--r-- | changes/bug31003 | 4 | ||||
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/changes/bug31003 b/changes/bug31003 new file mode 100644 index 0000000000..6c75163380 --- /dev/null +++ b/changes/bug31003 @@ -0,0 +1,4 @@ + o Minor bugfixes (crash on exit): + - Avoid a set of possible code paths that could use try to use freed memory + in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on + 0.1.2.2-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 456f930aa3..e48675aada 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -954,20 +954,18 @@ routerlist_free_(routerlist_t *rl) smartlist_free(rl->routers); smartlist_free(rl->old_routers); if (rl->desc_store.mmap) { - int res = tor_munmap_file(routerlist->desc_store.mmap); + int res = tor_munmap_file(rl->desc_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); } } if (rl->extrainfo_store.mmap) { - int res = tor_munmap_file(routerlist->extrainfo_store.mmap); + int res = tor_munmap_file(rl->extrainfo_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap"); } } tor_free(rl); - - router_dir_info_changed(); } /** Log information about how much memory is being used for routerlist, @@ -1426,8 +1424,10 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) void routerlist_free_all(void) { - routerlist_free(routerlist); - routerlist = NULL; + routerlist_t *rl = routerlist; + routerlist = NULL; // Prevent internals of routerlist_free() from using + // routerlist. + routerlist_free(rl); dirlist_free_all(); if (warned_nicknames) { SMARTLIST_FOREACH(warned_nicknames, char *, cp, tor_free(cp)); |