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

Handle tor_munmap_file(NULL) consistently

Browse Source
This commit is contained in:
Nick Mathewson 2014-03-31 11:35:39 -04:00
parent dea8190111
commit 7cdb50e866
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/compat.c
View File

@ -354,7 +354,9 @@ tor_mmap_file(const char *filename)
int
tor_munmap_file(tor_mmap_t *handle)
{
tor_assert(handle != NULL);
if (handle == NULL)
return 0;
if (handle->data) {
/* This is an ugly cast, but without it, "data" in struct tor_mmap_t would
have to be redefined as non-const. */
@ -394,8 +396,9 @@ int
tor_munmap_file(tor_mmap_t *handle)
{
char *d = NULL;
if (handle == NULL)
return 0;
tor_assert(handle != NULL);
d = (char*)handle->data;
tor_free(d);
memwipe(handle, 0, sizeof(tor_mmap_t));