aboutsummaryrefslogtreecommitdiff
path: root/src/or/hs_descriptor.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-13 22:36:47 -0400
committerNick Mathewson <nickm@torproject.org>2017-03-13 22:36:47 -0400
commit236e1f31d9bb6494fdc700f49739fe381d10bed6 (patch)
tree33d2c4848477a7bc8a047e7fde094571c5cbbd44 /src/or/hs_descriptor.c
parentdc37ea8b9815e75905a6b8b606947866afc9b27b (diff)
downloadtor-236e1f31d9bb6494fdc700f49739fe381d10bed6.tar.gz
tor-236e1f31d9bb6494fdc700f49739fe381d10bed6.zip
Fix some compilation warnings in {test_,}hs_descriptor.c
Nothing big: just some const char[]s that should have been static, and some integer truncation warnings. Warnings not in any released Tor.
Diffstat (limited to 'src/or/hs_descriptor.c')
-rw-r--r--src/or/hs_descriptor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index f441fbf03b..94f7ce865b 100644
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -1505,8 +1505,9 @@ decode_superencrypted(const char *message, size_t message_len,
/* Copy the encrypted blob to the descriptor object so we can handle it
* latter if needed. */
+ tor_assert(tok->object_size <= INT_MAX);
*encrypted_out = tor_memdup(tok->object_body, tok->object_size);
- retval = tok->object_size;
+ retval = (int) tok->object_size;
}
err: