[tor-commits] [tor/master] Suppress a coverity false positive in connection_edge_package_raw_inbuf

[nickm at torproject.org]

commit 43d2f99d54d92234615d68935661787d14a89688
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 11 15:55:50 2013 -0500

    Suppress a coverity false positive in connection_edge_package_raw_inbuf
    
    Coverity is worried that we're checking entry_conn in some cases,
    but not in the case where we set entry_conn->pending_optimistic_data.
    
    This commit should calm it down (CID 718623).
---
 src/or/relay.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 12283fc..22bc40d 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1563,11 +1563,12 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial,
   circuit_t *circ;
   const unsigned domain = conn->base_.type == CONN_TYPE_AP ? LD_APP : LD_EXIT;
   int sending_from_optimistic = 0;
+  entry_connection_t *entry_conn =
+    conn->base_.type == CONN_TYPE_AP ? EDGE_TO_ENTRY_CONN(conn) : NULL;
   const int sending_optimistically =
+    entry_conn &&
     conn->base_.type == CONN_TYPE_AP &&
     conn->base_.state != AP_CONN_STATE_OPEN;
-  entry_connection_t *entry_conn =
-    conn->base_.type == CONN_TYPE_AP ? EDGE_TO_ENTRY_CONN(conn) : NULL;
   crypt_path_t *cpath_layer = conn->cpath_layer;
 
   tor_assert(conn);