Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strlcpy: Check for maxlen underflow #432

Merged
merged 2 commits into from
Jan 13, 2021
Merged

strlcpy: Check for maxlen underflow #432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0258f
strlcpy: Check for maxlen underflow
chrissie-c Jan 4, 2021
3694ae6
Always terminate the string if maxlen is > 0
chrissie-c Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/strlcpy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ strlcpy(char *dest, const char * src, size_t maxlen)
size_t srclen = strlen(src);
size_t len2cpy = QB_MIN(maxlen-1, srclen);

if (len2cpy > 0) {
strncpy(dest, src, len2cpy+1);
/* check maxlen separately as it could have underflowed from 0 above. */
if (maxlen) {
if (len2cpy > 0) {
strncpy(dest, src, len2cpy+1);
}
/* Always terminate, even if its empty */
dest[len2cpy] = '\0';
}
return srclen;
Expand Down