diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-10 19:33:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-10 19:33:07 -0400 |
| commit | 7d80bf80fe9017e04fff4b588f49d0393332ebee (patch) | |
| tree | 23b943d3dd021bae6946c61f2a452c0ac93bd6b5 /src | |
| parent | c1b440f7606303225b20e7a7a893afe6ecbc504e (diff) | |
| parent | f3fcc89d055811065bd9fe723b4d71b755b82edc (diff) | |
| download | tor-7d80bf80fe9017e04fff4b588f49d0393332ebee.tar.gz tor-7d80bf80fe9017e04fff4b588f49d0393332ebee.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/rend/rendclient.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 09db7045fa..d33b61851f 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -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; |