Browse Source

AP_Menu: avoid segmentation fault

Insufficient input would cause a segfault
mission-4.1.18
Peter Barker 10 years ago committed by Andrew Tridgell
parent
commit
39b2cdcc3c
  1. 2
      libraries/AP_Menu/AP_Menu.cpp

2
libraries/AP_Menu/AP_Menu.cpp

@ -106,7 +106,7 @@ Menu::_run_command(bool prompt_on_enter) @@ -106,7 +106,7 @@ Menu::_run_command(bool prompt_on_enter)
// XXX should an empty line by itself back out of the current menu?
while (argc <= _args_max) {
_argv[argc].str = strtok_r(NULL, " ", &s);
if ('\0' == _argv[argc].str[0])
if (_argv[argc].str == NULL || '\0' == _argv[argc].str[0])
break;
_argv[argc].i = atol(_argv[argc].str);
_argv[argc].f = atof(_argv[argc].str); // calls strtod, > 700B !

Loading…
Cancel
Save