From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Nov 2012 02:24:05 +0000 (-0500)
Subject: Add a pointless 2-byte memset in cell_pack
X-Git-Tag: tor-0.2.4.11-alpha~24^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 11d38f8870..0775eb5c40 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);