From: Roger Dingledine <arma@torproject.org>
Date: Thu, 24 Feb 2005 10:22:00 +0000 (+0000)
Subject: stop a potential overflow (pointed out by ilja)
X-Git-Tag: tor-0.1.0.1-rc~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8054f82992105c5e69f7ea10c578e23479234e8a;p=thirdparty%2Ftor.git

stop a potential overflow (pointed out by ilja)


svn:r3681
---

diff --git a/src/or/relay.c b/src/or/relay.c
index a403875f67..4029823c85 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -436,8 +436,10 @@ int connection_edge_send_command(connection_t *fromconn, circuit_t *circ,
     rh.stream_id = fromconn->stream_id; /* else it's 0 */
   rh.length = payload_len;
   relay_header_pack(cell.payload, &rh);
-  if (payload_len)
+  if (payload_len) {
+    tor_assert(payload_len <= RELAY_PAYLOAD_SIZE);
     memcpy(cell.payload+RELAY_HEADER_SIZE, payload, payload_len);
+  }
 
   log_fn(LOG_DEBUG,"delivering %d cell %s.", relay_command,
          cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward");