summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-06 10:12:11 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-06 10:12:11 -0400
commitdeee0b67c3171cf4a6c7cf9c64c642d882b39880 (patch)
tree80610e62eff15b2a38e1a2ff05ff16fcc0dd7d21
parent00120544a4bfa9c26d2c8a336389d33b8b3642c2 (diff)
parent8284c2bcba4d8daecf5416fa88324212c5fc17ea (diff)
downloadtor-deee0b67c3171cf4a6c7cf9c64c642d882b39880.tar.gz
tor-deee0b67c3171cf4a6c7cf9c64c642d882b39880.zip
Merge remote-tracking branch 'asn/bug6765'
-rw-r--r--src/or/connection_or.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index da27cba32d..5a3b6205a9 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -327,7 +327,7 @@ var_cell_t *
var_cell_new(uint16_t payload_len)
{
size_t size = STRUCT_OFFSET(var_cell_t, payload) + payload_len;
- var_cell_t *cell = tor_malloc(size);
+ var_cell_t *cell = tor_malloc_zero(size);
cell->payload_len = payload_len;
cell->command = 0;
cell->circ_id = 0;