Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #344

Browse Source 
e027831 console_handler: do not call a NULL function pointer (moneromooo-monero)
b87e066 console_handler: check for eof before trying to use input (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-07-18 22:59:26 +02:00
commit f6e28b81a8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/epee/include/console_handler.h
View File

@ -274,14 +274,15 @@ namespace epee
} }
std::string command; std::string command;
if(!m_stdin_reader.get_line(command)) bool get_line_ret = m_stdin_reader.get_line(command);
{
LOG_PRINT("Failed to read line.", LOG_LEVEL_0);
}
if (m_stdin_reader.eos()) if (m_stdin_reader.eos())
{ {
break; break;
} }
if (!get_line_ret)
{
LOG_PRINT("Failed to read line.", LOG_LEVEL_0);
}
string_tools::trim(command); string_tools::trim(command);
LOG_PRINT_L2("Read command: " << command); LOG_PRINT_L2("Read command: " << command);
@ -303,7 +304,8 @@ namespace epee
std::cout << usage; std::cout << usage;
} }
} }
exit_handler(); if (exit_handler)
exit_handler();
return true; return true;
CATCH_ENTRY_L0("console_handler", false); CATCH_ENTRY_L0("console_handler", false);
} }