[tor-commits] [tor/master] Don't send uninitialized stack to the controller and say it's a date.

nickm at torproject.org nickm at torproject.org
Tue Apr 15 18:52:59 UTC 2014


commit b2106956e0adc0382f033e1a6cd0896a24122d05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 14 21:51:30 2014 -0400

    Don't send uninitialized stack to the controller and say it's a date.
    
    Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha.
---
 changes/bug11519    |    3 +++
 src/or/circuituse.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug11519 b/changes/bug11519
new file mode 100644
index 0000000..5c1e6af
--- /dev/null
+++ b/changes/bug11519
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Avoid sending an garbage value to the controller when a circuit is
+      cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha.
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index ade4224..7218ecc 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1310,7 +1310,7 @@ circuit_launch_by_extend_info(uint8_t purpose,
     circ = circuit_find_to_cannibalize(purpose, extend_info, flags);
     if (circ) {
       uint8_t old_purpose = circ->_base.purpose;
-      struct timeval old_timestamp_created;
+      struct timeval old_timestamp_created = circ->_base.timestamp_created;
 
       log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)",
                build_state_get_exit_nickname(circ->build_state), purpose,





More information about the tor-commits mailing list