mirror of
https://github.com/swaywm/sway.git
synced 2024-12-28 07:56:31 +01:00
Replace strncpy with memcpy
strncpy is useless here, is dangerous because it doesn't guarantee that the string is NUL-terminated and causes the following warning: ../sway/criteria.c: In function ‘criteria_parse’: ../sway/criteria.c:712:25: error: ‘strncpy’ destination unchanged after copying no bytes [-Werror=stringop-truncation] 712 | strncpy(value, valuestart, head - valuestart); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
parent
7cfa150788
commit
1e9be019b2
1 changed files with 3 additions and 3 deletions
|
@ -682,7 +682,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
|
|||
}
|
||||
name = calloc(head - namestart + 1, 1);
|
||||
if (head != namestart) {
|
||||
strncpy(name, namestart, head - namestart);
|
||||
memcpy(name, namestart, head - namestart);
|
||||
}
|
||||
// Parse token value
|
||||
skip_spaces(&head);
|
||||
|
@ -709,7 +709,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
|
|||
}
|
||||
}
|
||||
value = calloc(head - valuestart + 1, 1);
|
||||
strncpy(value, valuestart, head - valuestart);
|
||||
memcpy(value, valuestart, head - valuestart);
|
||||
if (in_quotes) {
|
||||
++head;
|
||||
in_quotes = false;
|
||||
|
@ -740,7 +740,7 @@ struct criteria *criteria_parse(char *raw, char **error_arg) {
|
|||
++head;
|
||||
int len = head - raw;
|
||||
criteria->raw = calloc(len + 1, 1);
|
||||
strncpy(criteria->raw, raw, len);
|
||||
memcpy(criteria->raw, raw, len);
|
||||
return criteria;
|
||||
|
||||
cleanup:
|
||||
|
|
Loading…
Reference in a new issue