Skip to content
New issue

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

#

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

Already on GitHub? # to your account

strlcpy: avoid compiler warning from strncpy #473

Merged
merged 1 commit into from
Mar 23, 2023
Merged

strlcpy: avoid compiler warning from strncpy #473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions lib/strlcpy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@ size_t
strlcpy(char *dest, const char * src, size_t maxlen)
{
size_t srclen = strlen(src);
size_t len2cpy = QB_MIN(maxlen-1, srclen);

/* 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 */
size_t len2cpy = QB_MIN(maxlen-1, srclen);

memcpy(dest, src, len2cpy);
dest[len2cpy] = '\0';
}
return srclen;
Expand Down