diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-27 11:04:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-27 11:04:44 -0400 |
| commit | a242d194c74b318b8ee4b347efd09ed13d0d2549 (patch) | |
| tree | 0016a3a146c6a84bbaade038c04c2d6b600c7be5 /src/or/connection_or.c | |
| parent | bdd267e74d97cf2672fa2e1e9deb2a33fd755f2c (diff) | |
| parent | 711160a46f5fbba7106c23c29f99bed75928a5a7 (diff) | |
| download | tor-a242d194c74b318b8ee4b347efd09ed13d0d2549.tar.gz tor-a242d194c74b318b8ee4b347efd09ed13d0d2549.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.0
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6eb62a99de..e7a55a80a6 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -419,9 +419,11 @@ cell_pack(packed_cell_t *dst, const cell_t *src, int wide_circ_ids) set_uint32(dest, htonl(src->circ_id)); dest += 4; } else { + /* Clear the last two bytes of dest, in case we can accidentally + * send them to the network somehow. */ + memset(dest+CELL_MAX_NETWORK_SIZE-2, 0, 2); set_uint16(dest, htons(src->circ_id)); dest += 2; - memset(dest+CELL_MAX_NETWORK_SIZE-2, 0, 2); /*make sure it's clear */ } set_uint8(dest, src->command); memcpy(dest+1, src->payload, CELL_PAYLOAD_SIZE); |