summaryrefslogtreecommitdiff
path: root/src/or/buffers.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-08 16:45:46 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-08 16:45:46 -0500
commit9ad4776e6150a29fdfff607721599eb04c6e76d7 (patch)
tree7189ed200ae8f47bf7d3399d0b99243dc93bced3 /src/or/buffers.c
parent758428dd32128874cefacc92ef63c1b5bc9a656e (diff)
parent49dd5ef3a3d1775fdc3c0a7d069d3097b3baeeec (diff)
downloadtor-9ad4776e6150a29fdfff607721599eb04c6e76d7.tar.gz
tor-9ad4776e6150a29fdfff607721599eb04c6e76d7.zip
Merge branch 'bug7352_023_rebased' into maint-0.2.3
Diffstat (limited to 'src/or/buffers.c')
-rw-r--r--src/or/buffers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 9acc22971a..ad5ab83e4f 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1546,14 +1546,14 @@ socks_request_free(socks_request_t *req)
if (!req)
return;
if (req->username) {
- memset(req->username, 0x10, req->usernamelen);
+ memwipe(req->username, 0x10, req->usernamelen);
tor_free(req->username);
}
if (req->password) {
- memset(req->password, 0x04, req->passwordlen);
+ memwipe(req->password, 0x04, req->passwordlen);
tor_free(req->password);
}
- memset(req, 0xCC, sizeof(socks_request_t));
+ memwipe(req, 0xCC, sizeof(socks_request_t));
tor_free(req);
}