commit 7e91eb83d84b2fd3992c3c4bba49ffd0acb5db08
parent 22e24031452d57852e83738bacfff012439f0258
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Sep 2018 08:45:10 -0400
Merge branch 'maint-0.3.4'
Diffstat:
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/changes/bug27463 b/changes/bug27463
@@ -0,0 +1,3 @@
+ o Minor bugfixes (onion services):
+ - Silence a spurious compiler warning in rend_client_send_introduction().
+ Fixes bug 27463; bugfix on 0.1.1.2-alpha.
diff --git a/changes/bug27465 b/changes/bug27465
@@ -0,0 +1,5 @@
+ o Minor bugfixes (compilation):
+ - Silence a spurious compiler warning on the GetAdaptersAddresses
+ function pointer cast. This issue is already fixed by 26481 in
+ 0.3.5 and later, by removing the lookup and cast.
+ Fixes bug 27465; bugfix on 0.2.3.11-alpha.
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
@@ -252,6 +252,15 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
dh_offset = v3_shift+7+DIGEST_LEN+2+klen+REND_COOKIE_LEN;
} else {
/* Version 0. */
+
+ /* Some compilers are smart enough to work out that nickname can be more
+ * than 19 characters, when it's a hexdigest. They warn that strncpy()
+ * will truncate hexdigests without NUL-terminating them. But we only put
+ * hexdigests in HSDir and general circuit exits. */
+ if (BUG(strlen(rendcirc->build_state->chosen_exit->nickname)
+ > MAX_NICKNAME_LEN)) {
+ goto perm_err;
+ }
strncpy(tmp, rendcirc->build_state->chosen_exit->nickname,
(MAX_NICKNAME_LEN+1)); /* nul pads */
memcpy(tmp+MAX_NICKNAME_LEN+1, rendcirc->rend_data->rend_cookie,
