jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crashes with unknown/invalid commands

Browse source
This commit is contained in:
Simon Fels 2016-09-17 11:31:04 +02:00
commit 48839a9ea3
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/anbox/cli.cpp
View file

@ -141,8 +141,10 @@ void cli::CommandWithSubcommands::help(std::ostream& out)
if (commands_.size() > 0) if (commands_.size() > 0)
{ {
out << std::endl << pattern::commands << std::endl; out << std::endl << pattern::commands << std::endl;
for (const auto& cmd : commands_) for (const auto& cmd : commands_) {
out << boost::format(pattern::command) % cmd.second->name() % cmd.second->description() << std::endl; if (cmd.second)
out << boost::format(pattern::command) % cmd.second->name() % cmd.second->description() << std::endl;
}
} }
} }
@ -169,7 +171,15 @@ int cli::CommandWithSubcommands::run(const cli::Command::Context& ctxt)
po::store(parsed, vm); po::store(parsed, vm);
po::notify(vm); po::notify(vm);
return commands_[vm["command"].as<std::string>()]->run(cli::Command::Context auto cmd = commands_[vm["command"].as<std::string>()];
if (!cmd)
{
ctxt.cout << "Unknown command '" << vm["command"].as<std::string>() << "'" << std::endl;
help(ctxt.cout);
return EXIT_FAILURE;
}
return cmd->run(cli::Command::Context
{ {
ctxt.cin, ctxt.cin,
ctxt.cout, ctxt.cout,