summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-11 11:05:31 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-11 11:05:31 -0500
commit7b51667d638242b9e47bdd0d4357596c380f7c94 (patch)
tree45033c7cf87d8791ae2facc0185d7cf258ac517d /changes
parentb2663298e9179368d521d9088b2bbf0f12b490e2 (diff)
parentb08cfc65a78527cc97f4d0aeff3217d5f1c93e08 (diff)
downloadtor-7b51667d638242b9e47bdd0d4357596c380f7c94.tar.gz
tor-7b51667d638242b9e47bdd0d4357596c380f7c94.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug14142-parse-virtual-addr7
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug14142-parse-virtual-addr b/changes/bug14142-parse-virtual-addr
new file mode 100644
index 0000000000..f78b7c7d81
--- /dev/null
+++ b/changes/bug14142-parse-virtual-addr
@@ -0,0 +1,7 @@
+ o Minor bugfixes (client):
+ - Check for a missing option value in parse_virtual_addr_network
+ before asserting on the NULL in tor_addr_parse_mask_ports.
+ This avoids crashing on torrc lines like
+ Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option.
+ Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142.
+ Patch by "teor".