summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-19 13:22:50 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-19 13:22:50 -0500
commit971e83ef9c284ff82fdeedb7851fed5b3386dd1a (patch)
tree05df5ae60546760c44d2bee78c3dd980ea42be50
parent8875a028a738b131a6dce33675ed90c5711ba1e0 (diff)
downloadtor-971e83ef9c284ff82fdeedb7851fed5b3386dd1a.tar.gz
tor-971e83ef9c284ff82fdeedb7851fed5b3386dd1a.zip
Fix two more SIZE_T_CEILING issues
This patch imposes (very long) limits on the length of a line in a directory document, and on the length of a certificate. I don't think it should actually be possible to overrun these remotely, since we already impose a maximum size on any directory object we're downloading, but a little defensive programming never hurt anybody. Roger emailed me that doorss reported these on IRC, but nobody seems to have put them on the bugtracker.
-rw-r--r--changes/routerparse_maxima4
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/routerparse_maxima b/changes/routerparse_maxima
new file mode 100644
index 0000000000..340f2c3c2d
--- /dev/null
+++ b/changes/routerparse_maxima
@@ -0,0 +1,4 @@
+ o Minor bugfixes
+ - Check for and reject overly long directory certificates and
+ directory tokens before they have a chance to hit any
+ assertions. Bugfix on 0.2.1.28. Found by doorss.