mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 21:14:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2118 from RedSoxFan/fix-2117

Browse Source 
Remove strip quoting and fix strncpy-overlap
This commit is contained in:
emersion 2018-06-08 08:55:29 +01:00 committed by GitHub
commit bf6ca69ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sway/commands.c
View File

@ -274,7 +274,6 @@ struct cmd_results *execute_command(char *_exec, struct sway_seat *seat) {
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
argv[i] = do_var_replacement(argv[i]); argv[i] = do_var_replacement(argv[i]);
unescape_string(argv[i]); unescape_string(argv[i]);
strip_quotes(argv[i]);
} }
if (!config->handler_context.using_criteria) { if (!config->handler_context.using_criteria) {

2
sway/config.c
View File

@ -660,7 +660,7 @@ char *do_var_replacement(char *str) {
// Unescape double $ and move on // Unescape double $ and move on
if (find[1] == '$') { if (find[1] == '$') {
size_t length = strlen(find + 1); size_t length = strlen(find + 1);
strncpy(find, find + 1, length); memmove(find, find + 1, length);
find[length] = '\0'; find[length] = '\0';
++find; ++find;
continue; continue;