From b6b1b4f2838addea9cc9d650b6b1ee27ed42ea88 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 25 Nov 2005 02:16:10 +0000
Subject: [PATCH] Bandaid workaround to make cvs not crash tor clients. This is
 not a real fix. I didn't look at the rest of the code. Nick?

svn:r5455
---
 src/common/container.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/container.c b/src/common/container.c
index b5bb6cd0bf..d34299254f 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -760,8 +760,10 @@ strmap_iter_next_rmv(strmap_t *map, strmap_iter_t *iter)
   tor_assert(map);
   tor_assert(iter);
   next = HT_NEXT_RMV(strmap_tree, &map->head, iter);
-  tor_free((*iter)->key);
-  tor_free(*iter);
+  if (*iter) {
+    tor_free((*iter)->key);
+    tor_free(*iter);
+  }
   return next;
 }