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 | ccae991662adb3b64bdb1dcd4a942e4d1e163414 (patch) | |
| tree | 16d34adaf88e311fca522b65b16eb6ad76c749f4 /src | |
| parent | 325c507a090589ada4f0a781a313214c7cfd33a0 (diff) | |
| parent | d56f6993990ab75b6ab8a80027ee60e610489a2c (diff) | |
| download | tor-ccae991662adb3b64bdb1dcd4a942e4d1e163414.tar.gz tor-ccae991662adb3b64bdb1dcd4a942e4d1e163414.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'src')
| -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 c372270b4c..8c8094b440 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -427,9 +427,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); |