fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

tune_control: prevent segfault

Browse Source
This commit is contained in:
Julian Oes 2021-09-28 11:31:41 +02:00 committed by Daniel Agar
parent 856e229482
commit a21fefda48
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/systemcmds/tune_control/tune_control.cpp
View File

@ -150,11 +150,11 @@ extern "C" __EXPORT int tune_control_main(int argc, char *argv[])
int exit_counter = 0;
if (!strcmp(argv[myoptind], "play")) {
if (argc >= 2 && !strcmp(argv[2], "error")) {
if (argc > 2 && !strcmp(argv[2], "error")) {
tune_control.tune_id = tune_control_s::TUNE_ID_ERROR;
publish_tune_control(tune_control);
} else if (string_input) {
} else if (argc > 2 && string_input) {
PX4_INFO("Start playback...");
tunes.set_string(tune_string, tune_control.volume);
@ -176,7 +176,7 @@ extern "C" __EXPORT int tune_control_main(int argc, char *argv[])
PX4_INFO("Playback finished.");
} else {
} else if (argc > 2) {
// tune id instead of string has been provided
if (tune_control.tune_id == 0) {
tune_control.tune_id = 1;
@ -184,6 +184,10 @@ extern "C" __EXPORT int tune_control_main(int argc, char *argv[])
PX4_DEBUG("Publishing standard tune %d", tune_control.tune_id);
publish_tune_control(tune_control);
} else {
PX4_WARN("Missing argument");
usage();
return 1;
}
} else if (!strcmp(argv[myoptind], "libtest")) {