summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-11 09:45:48 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-11 09:45:48 -0400
commit733afb52a8267d4b74e9437c71a0d8c65a9b954a (patch)
tree1380399a4664f94c3c9ce2f3fce8caea8985423c
parent911f95ed9203225f74b16b28dc46c76caf57f227 (diff)
parenta9c84bfd358799dc2dbe805ff6db4a6ca184ef0b (diff)
downloadtor-733afb52a8267d4b74e9437c71a0d8c65a9b954a.tar.gz
tor-733afb52a8267d4b74e9437c71a0d8c65a9b954a.zip
Merge branch 'maint-0.4.0'
-rw-r--r--src/lib/time/compat_time.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c
index 33e077a587..c6625c7806 100644
--- a/src/lib/time/compat_time.c
+++ b/src/lib/time/compat_time.c
@@ -522,7 +522,9 @@ monotime_init_internal(void)
GetTickCount64_fn = (GetTickCount64_fn_t)
GetProcAddress(h, "GetTickCount64");
}
- // FreeLibrary(h) ?
+ // We can't call FreeLibrary(h) here, because freeing the handle may
+ // unload the library, and cause future calls to GetTickCount64_fn()
+ // to fail. See 29642 for details.
}
void