[tor-commits] [tor/master] Add a pointless 2-byte memset in cell_pack

nickm at torproject.org nickm at torproject.org
Fri Feb 15 21:23:51 UTC 2013


commit 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 21:24:05 2012 -0500

    Add a pointless 2-byte memset in cell_pack
    
    There is probably no code that can write the 2 bytes at the end of the
    packed_cell_t when the cell is only a 512-byte cell, but let's not get
    overconfident there.
---
 src/or/connection_or.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 11d38f8..0775eb5 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -361,6 +361,7 @@ cell_pack(packed_cell_t *dst, const cell_t *src, int wide_circ_ids)
   } else {
     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);





More information about the tor-commits mailing list