[or-cvs] r11248: backport r11247 (in tor/branches/tor-0_1_2-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-08-21 23:04:09 -0400 (Tue, 21 Aug 2007)
New Revision: 11248

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/circuitbuild.c
Log:
backport r11247


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-22 03:03:24 UTC (rev 11247)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-08-22 03:04:09 UTC (rev 11248)
@@ -43,6 +43,8 @@
       encourage people using them to stop.
     - Terminate multi-line control events properly. Original patch
       from tup.
+    - Fix a minor memory leak when we fail to find enough suitable
+      servers to choose a circuit.
 
 
 Changes in version 0.1.2.16 - 2007-08-01

Modified: tor/branches/tor-0_1_2-patches/src/or/circuitbuild.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/circuitbuild.c	2007-08-22 03:03:24 UTC (rev 11247)
+++ tor/branches/tor-0_1_2-patches/src/or/circuitbuild.c	2007-08-22 03:04:09 UTC (rev 11248)
@@ -1253,7 +1253,7 @@
      * at least one predicted exit port. */
 
     int try;
-    smartlist_t *needed_ports = circuit_get_unhandled_ports(time(NULL));
+    smartlist_t *needed_ports;
 
     if (best_support == -1) {
       if (need_uptime || need_capacity) {
@@ -1271,6 +1271,7 @@
       log_notice(LD_CIRC, "All routers are down or won't exit -- choosing a "
                  "doomed exit at random.");
     }
+    needed_ports = circuit_get_unhandled_ports(time(NULL));
     for (try = 0; try < 2; try++) {
       /* try once to pick only from routers that satisfy a needed port,
        * then if there are none, pick from any that support exiting. */