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

Add return value and assert for null parameter to tor_munmap_file()

Browse Source
This commit is contained in:
Andrea Shepard 2014-03-18 10:47:17 -07:00 committed by Nick Mathewson
parent 102bb1c04f
commit 389251eda9
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/common/compat.c
View File

@ -227,12 +227,27 @@ tor_mmap_file(const char *filename)
return res; return res;
} }
/** Release storage held for a memory mapping. */ /** Release storage held for a memory mapping; returns 0 on success,
void * or -1 on failure (and logs a warning). */
int
tor_munmap_file(tor_mmap_t *handle) tor_munmap_file(tor_mmap_t *handle)
{ {
munmap((char*)handle->data, handle->mapping_size); int res;
tor_free(handle);
if (handle == NULL)
return 0;
res = munmap((char*)handle->data, handle->mapping_size);
if (res == 0) {
/* munmap() succeeded */
tor_free(handle);
} else {
log_warn(LD_FS, "Failed to munmap() in tor_munmap_file(): %s",
strerror(errno));
res = -1;
}
return res;
} }
#elif defined(_WIN32) #elif defined(_WIN32)
tor_mmap_t * tor_mmap_t *
@ -314,17 +329,27 @@ tor_mmap_file(const char *filename)
tor_munmap_file(res); tor_munmap_file(res);
return NULL; return NULL;
} }
void
/* Unmap the file, and return 0 for success or -1 for failure */
int
tor_munmap_file(tor_mmap_t *handle) tor_munmap_file(tor_mmap_t *handle)
{ {
if (handle->data) tor_assert(handle != NULL);
if (handle->data) {
/* This is an ugly cast, but without it, "data" in struct tor_mmap_t would /* This is an ugly cast, but without it, "data" in struct tor_mmap_t would
have to be redefined as non-const. */ have to be redefined as non-const. */
UnmapViewOfFile( (LPVOID) handle->data); BOOL ok = UnmapViewOfFile( (LPVOID) handle->data);
if (!ok) {
log_warn(LD_FS, "Failed to UnmapViewOfFile() in tor_munmap_file(): %d",
(int)GetLastError());
}
}
if (handle->mmap_handle != NULL) if (handle->mmap_handle != NULL)
CloseHandle(handle->mmap_handle); CloseHandle(handle->mmap_handle);
tor_free(handle); tor_free(handle);
return 0;
} }
#else #else
tor_mmap_t * tor_mmap_t *
@ -340,13 +365,24 @@ tor_mmap_file(const char *filename)
handle->size = st.st_size; handle->size = st.st_size;
return handle; return handle;
} }
void
/** Unmap the file mapped with tor_mmap_file(), and return 0 for success
* or -1 for failure.
*/
int
tor_munmap_file(tor_mmap_t *handle) tor_munmap_file(tor_mmap_t *handle)
{ {
char *d = (char*)handle->data; char *d = NULL;
tor_assert(handle != NULL);
d = (char*)handle->data;
tor_free(d); tor_free(d);
memwipe(handle, 0, sizeof(tor_mmap_t)); memwipe(handle, 0, sizeof(tor_mmap_t));
tor_free(handle); tor_free(handle);
/* Can't fail in this mmap()/munmap()-free case */
return 0;
} }
#endif #endif

2
src/common/compat.h
View File

@ -292,7 +292,7 @@ typedef struct tor_mmap_t {
} tor_mmap_t; } tor_mmap_t;
tor_mmap_t *tor_mmap_file(const char *filename) ATTR_NONNULL((1)); tor_mmap_t *tor_mmap_file(const char *filename) ATTR_NONNULL((1));
void tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1)); int tor_munmap_file(tor_mmap_t *handle) ATTR_NONNULL((1));
int tor_snprintf(char *str, size_t size, const char *format, ...) int tor_snprintf(char *str, size_t size, const char *format, ...)
CHECK_PRINTF(3,4) ATTR_NONNULL((1,3)); CHECK_PRINTF(3,4) ATTR_NONNULL((1,3));