diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
| commit | 81deddb08c6b8bf644f663dcdc31720e365f68dc (patch) | |
| tree | 9e67efdfb4451dcc169727dc0e64f8f5bfca95b8 /src/or/buffers.c | |
| parent | 9f3f5372b880b3372fd7b9fc98bd3d78f969390a (diff) | |
| parent | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (diff) | |
| download | tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Conflicts:
src/common/crypto.c
src/or/rendservice.c
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index a8d06cef1..f03047a64 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1544,14 +1544,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); } |