nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

clarify why strlcpy is safe in truncated log messages

Browse Source 
svn:r3032
This commit is contained in:
Nick Mathewson 2004-11-30 06:15:06 +00:00
parent a5d3325c5c
commit a3477223de
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/log.c
View File

@ -143,15 +143,14 @@ static INLINE char *format_msg(char *buf, size_t buf_len,
/* The message was too long; overwrite the end of the buffer with
* "[...truncated]" */
if (buf_len >= TRUNCATED_STR_LEN) {
/* This is safe, since we have an extra character after buf_len
to hold the \0. */
strlcpy(buf+buf_len-TRUNCATED_STR_LEN, TRUNCATED_STR,
buf_len-(buf_len-TRUNCATED_STR_LEN-1));
int offset = buf_len-TRUNCATED_STR_LEN;
/* We have an extra 2 characters after buf_len to hold the \n\0,
* so it's safe to add 1 to the size here. */
strlcpy(buf+offset, TRUNCATED_STR, buf_len-offset+1);
}
/* Set 'n' to the end of the buffer, where we'll be writing \n\0.
* Since we already subtracted 2 from buf_len, this is safe.*/
n = buf_len;
} else {
n += r;
}