]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Replace some assert(1)s with nonfatal_unreached_once().
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 20:06:53 +0000 (16:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 20:06:53 +0000 (16:06 -0400)
These were probably supposed to be assert(0).

src/or/channel.c
src/or/channeltls.c

index 939b7f93e4ec95a47ecd4f5e45810c10390b88c4..af5810788c16a4efe89f7226eb47414f1772fa49 100644 (file)
@@ -1738,7 +1738,7 @@ channel_get_cell_queue_entry_size(channel_t *chan, cell_queue_entry_t *q)
       rv = get_cell_network_size(chan->wide_circ_ids);
       break;
     default:
-      tor_assert(1);
+      tor_assert_nonfatal_unreached_once();
   }
 
   return rv;
index 5117672a6acbf6aca045be90df5ab523d62ef885..9fb309d0fd60aed2eb6c3df61b3214edf48845e1 100644 (file)
@@ -601,7 +601,7 @@ channel_tls_get_remote_descr_method(channel_t *chan, int flags)
         break;
       default:
         /* Something's broken in channel.c */
-        tor_assert(1);
+        tor_assert_nonfatal_unreached_once();
     }
   } else {
     strlcpy(buf, "(No connection)", sizeof(buf));
@@ -670,7 +670,7 @@ channel_tls_is_canonical_method(channel_t *chan, int req)
         break;
       default:
         /* This shouldn't happen; channel.c is broken if it does */
-        tor_assert(1);
+        tor_assert_nonfatal_unreached_once();
     }
   }
   /* else return 0 for tlschan->conn == NULL */