aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-09 11:09:30 -0400
committerNick Mathewson <nickm@torproject.org>2015-03-09 11:09:30 -0400
commit1a7419c3df300483f111923daca43febc33b368b (patch)
treed6f29a00ab21dbafaed2bf1d80386d7e54444ae1 /changes
parent51e36026e5b04384bf3311354ef0cd5a5cbf2d59 (diff)
parent6704e18dd2e09111eeca0c76fb00a459f9da98ea (diff)
downloadtor-1a7419c3df300483f111923daca43febc33b368b.tar.gz
tor-1a7419c3df300483f111923daca43febc33b368b.zip
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes')
-rw-r--r--changes/bug1508310
1 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug15083 b/changes/bug15083
new file mode 100644
index 0000000000..5cc79b5ba1
--- /dev/null
+++ b/changes/bug15083
@@ -0,0 +1,10 @@
+ o Major bugfixes (relay, stability, possible security):
+ - Fix a bug that could lead to a relay crashing with an assertion
+ failure if a buffer of exactly the wrong layout was passed
+ to buf_pullup() at exactly the wrong time. Fixes bug 15083;
+ bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'.
+
+ - Do not assert if the 'data' pointer on a buffer is advanced to the very
+ end of the buffer; log a BUG message instead. Only assert if it is
+ past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha.
+