From e0b0c2a4d20f2992d6a2d1c80ff751c54a0897ce Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Apr 2007 01:09:03 +0000
Subject: [PATCH]  r12544@catbus:  nickm | 2007-04-29 21:08:58 -0400  Fix an
 assertion when we call tor_free_all before calling do_main_loop(). Discovered
 by weasel.

svn:r10046
---
 src/or/relay.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 51e6702e61..a2058690d4 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1495,9 +1495,12 @@ init_cell_pool(void)
 void
 free_cell_pool(void)
 {
-  tor_assert(cell_pool);
-  mp_pool_destroy(cell_pool);
-  cell_pool = NULL;
+  /* Maybe we haven't called init_cell_pool yet; need to check for it. */
+  if (cell_pool) {
+    tor_assert(cell_pool);
+    mp_pool_destroy(cell_pool);
+    cell_pool = NULL;
+  }
 }
 
 /** Free excess storage in cell pool. */