summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-02-20 22:25:20 +0000
committerNick Mathewson <nickm@torproject.org>2007-02-20 22:25:20 +0000
commit275ce1d2a4533cb3f76dd246f9eda5c4c7a25c34 (patch)
tree5147fa261c85e93b2d133793aa8b3b5bc8d1cea3
parentb6e6b7101b43040632d3d171ec465086ea188f44 (diff)
downloadtor-275ce1d2a4533cb3f76dd246f9eda5c4c7a25c34.tar.gz
tor-275ce1d2a4533cb3f76dd246f9eda5c4c7a25c34.zip
r11852@catbus: nickm | 2007-02-20 17:25:17 -0500
Reverse arguments in memset() call in no-mmap version of tor_munmap_file(). Resolves bug 392. Spotted by "fookoowa"--thanks! svn:r9604
-rw-r--r--ChangeLog2
-rw-r--r--src/common/compat.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e717eba91b..bca9c7f260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@ Changes in version 0.1.2.8-alpha - 2007-??-??
- Mask out all signals in sub-threads; only the libevent signal handler
should be processing them. This should prevent some crashes on some
machines using pthreads. (Patch from coderman.)
+ - Fix switched arguments on memset in the implementation of tor_munmap()
+ for systems with no mmap() call.
o Minor features (controller):
- Warn the user when an application uses the obsolete binary v0
diff --git a/src/common/compat.c b/src/common/compat.c
index b06ac414b0..17676a4b73 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -280,7 +280,7 @@ tor_munmap_file(tor_mmap_t *handle)
{
char *d = (char*)handle->data;
tor_free(d);
- memset(handle, sizeof(tor_mmap_t), 0);
+ memset(handle, 0, sizeof(tor_mmap_t));
tor_free(handle);
}
#endif