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

shared/cgo: Don't use strlcpy #1337

Merged
merged 1 commit into from
Oct 25, 2024
+5 −15
Merged

shared/cgo: Don't use strlcpy #1337

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
20 changes: 5 additions & 15 deletions shared/cgo/process_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,6 @@ static inline int push_vargs(char ***list, char *entry)
return 0;
}

static inline size_t strlcpy(char *dest, const char *src, size_t size)
{
size_t ret = strlen(src);

if (size) {
size_t len = (ret >= size) ? size - 1 : ret;
memcpy(dest, src, len);
dest[len] = '\0';
}

return ret;
}

/*
* Sets the process title to the specified title. Note that this may fail if
* the kernel doesn't support PR_SET_MM_MAP (kernels <3.18).
Expand Down Expand Up @@ -231,8 +218,11 @@ static inline int setproctitle(char *title)

ret = prctl(PR_SET_MM, prctl_arg(PR_SET_MM_MAP), prctl_arg(&prctl_map),
prctl_arg(sizeof(prctl_map)), prctl_arg(0));
if (ret == 0)
(void)strlcpy((char *)arg_start, title, len);
if (ret == 0) {
char *dest = (char *)arg_start;
memcpy(dest, title, len - 1);
dest[len-1] = '\0';
}

return ret;
}
Expand Down
Loading