torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2' into maint-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson
2020-08-10 19:33:06 -04:00
parent 39d5e7c764 68f8250cbb
commit f3fcc89d05
3 changed files with 533 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/rend/rendclient.c
+2 -2
View File
@@ -261,8 +261,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
> MAX_NICKNAME_LEN)) {
goto perm_err;
}
strncpy(tmp, rendcirc->build_state->chosen_exit->nickname,
(MAX_NICKNAME_LEN+1)); /* nul pads */
strlcpy(tmp, rendcirc->build_state->chosen_exit->nickname,
sizeof(tmp));
memcpy(tmp+MAX_NICKNAME_LEN+1, rendcirc->rend_data->rend_cookie,
REND_COOKIE_LEN);
dh_offset = MAX_NICKNAME_LEN+1+REND_COOKIE_LEN;