summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-22 14:13:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-22 14:13:28 -0400
commit38f8b3c63deb5b4e9daaef1035574afbbb2f35d9 (patch)
tree60b3dff03a745323a74c312347d5911d4eae0847
parentcde5c9d0c335e51c254251f018e9de620c27d9db (diff)
parent80d673ccea4d6f784052dc5bc55cec04647556e7 (diff)
downloadtor-38f8b3c63deb5b4e9daaef1035574afbbb2f35d9.tar.gz
tor-38f8b3c63deb5b4e9daaef1035574afbbb2f35d9.zip
Merge branch 'maint-0.3.3'
-rw-r--r--src/or/protover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/protover.c b/src/or/protover.c
index 499a4713a0..b2f4a8f4b6 100644
--- a/src/or/protover.c
+++ b/src/or/protover.c
@@ -204,7 +204,7 @@ parse_single_entry(const char *s, const char *end_of_entry)
goto error;
/* The name must not be longer than MAX_PROTOCOL_NAME_LENGTH. */
- if (equals - s > MAX_PROTOCOL_NAME_LENGTH) {
+ if (equals - s > (int)MAX_PROTOCOL_NAME_LENGTH) {
log_warn(LD_NET, "When parsing a protocol entry, I got a very large "
"protocol name. This is possibly an attack or a bug, unless "
"the Tor network truly supports protocol names larger than "