aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-22 14:13:23 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-22 14:13:23 -0400
commit80d673ccea4d6f784052dc5bc55cec04647556e7 (patch)
treeb76840c4c319312017f05bfd5e6f2422c9789118
parenta5d4ce2b393955f60962d3db8744a846506c3e7b (diff)
parent7483aef896654a02ae1fa7ae616fbd1f2c27f3c5 (diff)
downloadtor-80d673ccea4d6f784052dc5bc55cec04647556e7.tar.gz
tor-80d673ccea4d6f784052dc5bc55cec04647556e7.zip
Merge branch 'trove-2018-005_032' into 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 8ca29bc0ff..674bb1c843 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 "