[or-cvs] Another related leak

Nick Mathewson nickm at seul.org
Fri Jan 30 21:16:53 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv20257

Modified Files:
	routerlist.c 
Log Message:
Another related leak

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- routerlist.c	30 Jan 2004 21:05:47 -0000	1.19
+++ routerlist.c	30 Jan 2004 21:16:51 -0000	1.20
@@ -869,18 +869,21 @@
   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;
 }
 



More information about the tor-commits mailing list