nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3282 from orestisf1993/strncpy-to-memcpy 

Replace strncpy call with memcpy when result is not NUL-terminated
This commit is contained in:
Ingo Bürk 2018-05-09 14:34:00 +02:00 committed by GitHub
parent 1cdb1ab721 f4981f97bc
commit ef378d87b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/src/ipc.c
View File

@ -309,7 +309,7 @@ int i3_send_msg(uint32_t type, const char *payload) {
char *buffer = smalloc(to_write); char *buffer = smalloc(to_write);
char *walk = buffer; char *walk = buffer;
strncpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)); memcpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC));
walk += strlen(I3_IPC_MAGIC); walk += strlen(I3_IPC_MAGIC);
memcpy(walk, &len, sizeof(uint32_t)); memcpy(walk, &len, sizeof(uint32_t));
walk += sizeof(uint32_t); walk += sizeof(uint32_t);

2
i3bar/src/xcb.c
View File

@ -604,7 +604,7 @@ void handle_button(xcb_button_press_event_t *event) {
const size_t len = namelen + strlen("workspace \"\"") + 1; const size_t len = namelen + strlen("workspace \"\"") + 1;
char *buffer = scalloc(len + num_quotes, 1); char *buffer = scalloc(len + num_quotes, 1);
strncpy(buffer, "workspace \"", strlen("workspace \"")); memcpy(buffer, "workspace \"", strlen("workspace \""));
size_t inpos, outpos; size_t inpos, outpos;
for (inpos = 0, outpos = strlen("workspace \""); for (inpos = 0, outpos = strlen("workspace \"");
inpos < namelen; inpos < namelen;