瀏覽代碼

r9567@Kushana: nickm | 2006-11-20 11:05:59 -0500
Fix leak in choose_good_exit_server_general()


svn:r8969

Nick Mathewson 19 年之前
父節點
當前提交
a667f2e514
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 1 0
      ChangeLog
  2. 5 1
      src/or/circuitbuild.c

+ 1 - 0
ChangeLog

@@ -18,6 +18,7 @@ Changes in version 0.1.2.4-alpha - 2006-11-??
       the client sends data.  Previously, the connection would just hang
       the client sends data.  Previously, the connection would just hang
       until the client sent data. (Patch from tup based on patch from
       until the client sent data. (Patch from tup based on patch from
       Zajcev Evgeny.)
       Zajcev Evgeny.)
+    - Fix a memory leak when we fail to pick an exit node.
 
 
   o Minor bugfixes
   o Minor bugfixes
     - Don't log spurious warnings when we see a circuit close reason we
     - Don't log spurious warnings when we see a circuit close reason we

+ 5 - 1
src/or/circuitbuild.c

@@ -1252,8 +1252,12 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
                  "to list of all routers.",
                  "to list of all routers.",
                  need_capacity?", fast":"",
                  need_capacity?", fast":"",
                  need_uptime?", stable":"");
                  need_uptime?", stable":"");
-        return choose_good_exit_server_general(dir, 0, 0);
+        return choose_good_exit_server_general(dir, 0, 0);//!!!!
       }
       }
+      smartlist_free(preferredexits);
+      smartlist_free(excludedexits);
+      smartlist_free(sl);
+      tor_free(n_supported);
       log_notice(LD_CIRC, "All routers are down or won't exit -- choosing a "
       log_notice(LD_CIRC, "All routers are down or won't exit -- choosing a "
                  "doomed exit at random.");
                  "doomed exit at random.");
     }
     }