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

http_protocol_handler: catch invalid numbers when parsing

Browse Source
This commit is contained in:
moneromooo-monero 2018-07-03 00:26:13 +01:00
parent a9b83f5a6e
commit 42f3b7cbca
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/epee/include/net/http_protocol_handler.inl
View File

@ -328,8 +328,10 @@ namespace net_utils
inline bool analize_http_method(const boost::smatch& result, http::http_method& method, int& http_ver_major, int& http_ver_minor) inline bool analize_http_method(const boost::smatch& result, http::http_method& method, int& http_ver_major, int& http_ver_minor)
{ {
CHECK_AND_ASSERT_MES(result[0].matched, false, "simple_http_connection_handler::analize_http_method() assert failed..."); CHECK_AND_ASSERT_MES(result[0].matched, false, "simple_http_connection_handler::analize_http_method() assert failed...");
http_ver_major = boost::lexical_cast<int>(result[11]); if (!boost::conversion::try_lexical_convert<int>(result[11], http_ver_major))
http_ver_minor = boost::lexical_cast<int>(result[12]); return false;
if (!boost::conversion::try_lexical_convert<int>(result[12], http_ver_minor))
return false;
if(result[3].matched) if(result[3].matched)
method = http::http_method_options; method = http::http_method_options;
@ -357,7 +359,12 @@ namespace net_utils
boost::smatch result; boost::smatch result;
if(boost::regex_search(m_cache, result, rexp_match_command_line, boost::match_default) && result[0].matched) if(boost::regex_search(m_cache, result, rexp_match_command_line, boost::match_default) && result[0].matched)
{ {
analize_http_method(result, m_query_info.m_http_method, m_query_info.m_http_ver_hi, m_query_info.m_http_ver_hi); if (!analize_http_method(result, m_query_info.m_http_method, m_query_info.m_http_ver_hi, m_query_info.m_http_ver_hi))
{
m_state = http_state_error;
MERROR("Failed to analyze method");
return false;
}
m_query_info.m_URI = result[10]; m_query_info.m_URI = result[10];
if (!parse_uri(m_query_info.m_URI, m_query_info.m_uri_content)) if (!parse_uri(m_query_info.m_URI, m_query_info.m_uri_content))
{ {
@ -554,7 +561,8 @@ namespace net_utils
if(!(boost::regex_search( str, result, rexp_mach_field, boost::match_default) && result[0].matched)) if(!(boost::regex_search( str, result, rexp_mach_field, boost::match_default) && result[0].matched))
return false; return false;
len = boost::lexical_cast<size_t>(result[0]); try { len = boost::lexical_cast<size_t>(result[0]); }
catch(...) { return false; }
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------