mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#2591] BadUSB: command parser fix (#2607)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Nikolay Minaylov 2023-05-03 07:39:14 +03:00 committed by GitHub
parent 59386f9fa9
commit 015ab4a024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
applications/main/bad_usb/helpers/ducky_script_commands.c
View File

@ -152,22 +152,22 @@ static int32_t ducky_fnc_waitforbutton(BadUsbScript* bad_usb, const char* line,
} }
static const DuckyCmd ducky_commands[] = { static const DuckyCmd ducky_commands[] = {
{"REM ", NULL, -1}, {"REM", NULL, -1},
{"ID ", NULL, -1}, {"ID", NULL, -1},
{"DELAY ", ducky_fnc_delay, -1}, {"DELAY", ducky_fnc_delay, -1},
{"STRING ", ducky_fnc_string, 0}, {"STRING", ducky_fnc_string, 0},
{"STRINGLN ", ducky_fnc_string, 1}, {"STRINGLN", ducky_fnc_string, 1},
{"DEFAULT_DELAY ", ducky_fnc_defdelay, -1}, {"DEFAULT_DELAY", ducky_fnc_defdelay, -1},
{"DEFAULTDELAY ", ducky_fnc_defdelay, -1}, {"DEFAULTDELAY", ducky_fnc_defdelay, -1},
{"STRINGDELAY ", ducky_fnc_strdelay, -1}, {"STRINGDELAY", ducky_fnc_strdelay, -1},
{"STRING_DELAY ", ducky_fnc_strdelay, -1}, {"STRING_DELAY", ducky_fnc_strdelay, -1},
{"REPEAT ", ducky_fnc_repeat, -1}, {"REPEAT", ducky_fnc_repeat, -1},
{"SYSRQ ", ducky_fnc_sysrq, -1}, {"SYSRQ", ducky_fnc_sysrq, -1},
{"ALTCHAR ", ducky_fnc_altchar, -1}, {"ALTCHAR", ducky_fnc_altchar, -1},
{"ALTSTRING ", ducky_fnc_altstring, -1}, {"ALTSTRING", ducky_fnc_altstring, -1},
{"ALTCODE ", ducky_fnc_altstring, -1}, {"ALTCODE", ducky_fnc_altstring, -1},
{"HOLD ", ducky_fnc_hold, -1}, {"HOLD", ducky_fnc_hold, -1},
{"RELEASE ", ducky_fnc_release, -1}, {"RELEASE", ducky_fnc_release, -1},
{"WAIT_FOR_BUTTON_PRESS", ducky_fnc_waitforbutton, -1}, {"WAIT_FOR_BUTTON_PRESS", ducky_fnc_waitforbutton, -1},
}; };
@ -175,8 +175,15 @@ static const DuckyCmd ducky_commands[] = {
#define WORKER_TAG TAG "Worker" #define WORKER_TAG TAG "Worker"
int32_t ducky_execute_cmd(BadUsbScript* bad_usb, const char* line) { int32_t ducky_execute_cmd(BadUsbScript* bad_usb, const char* line) {
size_t cmd_word_len = strcspn(line, " ");
for(size_t i = 0; i < COUNT_OF(ducky_commands); i++) { for(size_t i = 0; i < COUNT_OF(ducky_commands); i++) {
if(strncmp(line, ducky_commands[i].name, strlen(ducky_commands[i].name)) == 0) { size_t cmd_compare_len = strlen(ducky_commands[i].name);
if(cmd_compare_len != cmd_word_len) {
continue;
}
if(strncmp(line, ducky_commands[i].name, cmd_compare_len) == 0) {
if(ducky_commands[i].callback == NULL) { if(ducky_commands[i].callback == NULL) {
return 0; return 0;
} else { } else {