summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-03-11 09:45:31 -0400
committerNick Mathewson <nickm@torproject.org>2019-03-11 09:45:31 -0400
commita9c84bfd358799dc2dbe805ff6db4a6ca184ef0b (patch)
tree22777163d8470bf00f3de35fbb1b73a51200bc1a
parentc40d53ab3925638a04bd6d9088e748e0ea16cabf (diff)
parentf186f21a4efb9dafe2c29f850126d509079c0c37 (diff)
downloadtor-a9c84bfd358799dc2dbe805ff6db4a6ca184ef0b.tar.gz
tor-a9c84bfd358799dc2dbe805ff6db4a6ca184ef0b.zip
Merge remote-tracking branch 'tor-github/pr/756' into 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