nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net_parse_helpers: fix regex error checking

Browse Source
This commit is contained in:
moneromooo-monero 2017-12-13 11:04:34 +00:00
parent b49ddc766d
commit f0568ca6ac
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/include/net/net_parse_helpers.h
View File

@ -103,7 +103,7 @@ namespace net_utils
STATIC_REGEXP_EXPR_1(rexp_match_uri, "^([^?#]*)(\\?([^#]*))?(#(.*))?", boost::regex::icase | boost::regex::normal); STATIC_REGEXP_EXPR_1(rexp_match_uri, "^([^?#]*)(\\?([^#]*))?(#(.*))?", boost::regex::icase | boost::regex::normal);
boost::smatch result; boost::smatch result;
if(!boost::regex_search(uri, result, rexp_match_uri, boost::match_default) && result[0].matched) if(!(boost::regex_search(uri, result, rexp_match_uri, boost::match_default) && result[0].matched))
{ {
LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << uri); LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << uri);
content.m_path = uri; content.m_path = uri;
@ -139,7 +139,7 @@ namespace net_utils
// 12 34 5 6 7 // 12 34 5 6 7
content.port = 0; content.port = 0;
boost::smatch result; boost::smatch result;
if(!boost::regex_search(url_str, result, rexp_match_uri, boost::match_default) && result[0].matched) if(!(boost::regex_search(url_str, result, rexp_match_uri, boost::match_default) && result[0].matched))
{ {
LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << rexp_match_uri); LOG_PRINT_L1("[PARSE URI] regex not matched for uri: " << rexp_match_uri);
//content.m_path = uri; //content.m_path = uri;