diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:44:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:44:40 -0400 |
| commit | df18cf0e8fa9195df82bef9535f920ad913efab7 (patch) | |
| tree | c50c0dabedf82f3fc9d8ceed3e33f5ea0f2509e3 /src/or | |
| parent | 08d5fd39d85d4f7174b52ef5d53db001398481ea (diff) | |
| parent | a5ed62f96cafa1be251f9a7b4aafa519de4c2645 (diff) | |
| download | tor-df18cf0e8fa9195df82bef9535f920ad913efab7.tar.gz tor-df18cf0e8fa9195df82bef9535f920ad913efab7.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendclient.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 57815815b9..e61207f2ee 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -238,6 +238,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, |