]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Handle tor_munmap_file(NULL) consistently
authorNick Mathewson <nickm@torproject.org>
Mon, 31 Mar 2014 15:35:39 +0000 (11:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 31 Mar 2014 15:35:39 +0000 (11:35 -0400)
src/common/compat.c

index ead96ca30ec64f201ec64b4ad4f7c9cb553857a6..135f2c9af682ba7ffb0ebb353273988faaaccb20 100644 (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));