nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-05-12 11:21:59 -04:00
commit 621e95a4f3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/md_cache_replace Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes
- Avoid a bug that would keep us from replacing a microdescriptor
cache on Windows. (We would try to replace the file while still
holding it open. That's fine on Unix, but Windows doesn't let us
do that.) Bugfix on 0.2.2.6-alpha; bug found by wanoskarnet.

5
src/or/microdesc.c
View File

@ -449,10 +449,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
smartlist_add(wrote, md); smartlist_add(wrote, md);
} }
finish_writing_to_file(open_file); /*XXX Check me.*/
if (cache->cache_content) if (cache->cache_content)
tor_munmap_file(cache->cache_content); tor_munmap_file(cache->cache_content);
finish_writing_to_file(open_file); /*XXX Check me.*/
cache->cache_content = tor_mmap_file(cache->cache_fname); cache->cache_content = tor_mmap_file(cache->cache_fname);
if (!cache->cache_content && smartlist_len(wrote)) { if (!cache->cache_content && smartlist_len(wrote)) {