From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 31 Oct 2013 03:00:52 +0000 (-0400)
Subject: Add some clarity and checks to cell_queue_append_packed_copy
X-Git-Tag: tor-0.2.5.2-alpha~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6fee77375d246d3607b82577464a499685c1ce6;p=thirdparty%2Ftor.git

Add some clarity and checks to cell_queue_append_packed_copy

It's not cool to have "circ may be NULL if use_stats false, but
otherwise we crash" as an undocumented API constraint. :)
---

diff --git a/src/or/relay.c b/src/or/relay.c
index 7947ca373a..e0b5d26fe3 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2204,7 +2204,9 @@ cell_command_queue_pop(uint8_t *command, cell_queue_t *queue)
 }
 
 /** Append a newly allocated copy of <b>cell</b> to the end of the
- * <b>exitward</b> (or app-ward) <b>queue</b> of <b>circ</b>. */
+ * <b>exitward</b> (or app-ward) <b>queue</b> of <b>circ</b>.  If
+ * <b>use_stats</b> is true, record statistics about the cell.
+ */
 void
 cell_queue_append_packed_copy(circuit_t *circ, cell_queue_t *queue,
                               int exitward, const cell_t *cell,
@@ -2244,7 +2246,7 @@ cell_queue_append_packed_copy(circuit_t *circ, cell_queue_t *queue,
   }
   /* Remember that we added a cell to the queue, and remember the cell
    * command. */
-  if (get_options()->TestingEnableCellStatsEvent) {
+  if (get_options()->TestingEnableCellStatsEvent && circ) {
     testing_cell_stats_entry_t *ent =
                       tor_malloc_zero(sizeof(testing_cell_stats_entry_t));
     ent->command = cell->command;