Another related leak

svn:r1028

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 871b34b11f48a339b5b1fc50fb42809a4f17598e..1c658278b7ed2302b5dd6fb93e95a86a1cc20f2d 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -869,18 +869,21 @@ router_add_exit_policy_from_string(routerinfo_t *router, const char *s)
   tmp[len+1]='\0';
   if (router_get_next_token(&cp, &tok)) {
     log_fn(LOG_WARN, "Error reading exit policy: %s", tok.val.error);
-    free(tmp);
-    return -1;
+    goto err;
   }
   if (tok.tp != K_ACCEPT && tok.tp != K_REJECT) {
     log_fn(LOG_WARN, "Expected 'accept' or 'reject'.");
-    free(tmp);
-    return -1;
+    goto err;
   }
 
   /* Now that we've gotten an exit policy, add it to the router. */
   r = router_add_exit_policy(router, &tok);
+  goto done;
+ err:
+  r = -1;
+ done:
   free(tmp);
+  router_release_token(&tok);
   return r;
 }