[vidalia-svn] r3531: Backport r3530. (in vidalia/branches/vidalia-0.1: . src/torcontrol)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-16 20:33:36 -0500 (Mon, 16 Feb 2009)
New Revision: 3531

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/torcontrol/circuit.cpp
Log:

Backport r3530.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3482,3504-3505,3524-3526,3528
   + /vidalia/trunk:3482,3504-3505,3524-3526,3528,3530

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-02-17 01:30:38 UTC (rev 3530)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-02-17 01:33:36 UTC (rev 3531)
@@ -12,7 +12,9 @@
   o Backport a change that removes a verticalSpacing property from a .ui
     file, so Vidalia 0.1.x will still build on Qt 4.2. (Ticket #442)
   o Fix some memory leaks in the hidden service configuration dialog.
-  o Include a patch from Steven J. Murdoch that enables the Tor Browser
+  o Fix a CIRC event parsing bug that would occur when the CIRC event
+    contained a 0-hop circuit path and EXTENDED_EVENTS is enabled.
+  o Include patches from Steven J. Murdoch that enables the Tor Browser
     Bundle to launch Firefox itself without relying on Portable Firefox.
 
 

Modified: vidalia/branches/vidalia-0.1/src/torcontrol/circuit.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/torcontrol/circuit.cpp	2009-02-17 01:30:38 UTC (rev 3530)
+++ vidalia/branches/vidalia-0.1/src/torcontrol/circuit.cpp	2009-02-17 01:33:36 UTC (rev 3531)
@@ -49,7 +49,7 @@
     _status = Circuit::toStatus(parts.at(1));
 
     /* Get the circuit path (list of routers) */
-    if (parts.size() > 2) {
+    if (parts.size() > 2 && parts.at(2).startsWith("$")) {
       foreach (QString hop, parts.at(2).split(",")) {
         QStringList parts = hop.split(QRegExp("[=~]"));
         if (parts.size() != 2)