github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-06-25 22:32:07 +00:00
Code Issues Projects Releases Wiki Activity

use <onigposix.h> instead of <regex.h>

Browse Source 
Signed-off-by: VadimZy <vadim.zyarko@sysdig.com>
This commit is contained in:
VadimZy 2022-08-11 00:11:05 -07:00 committed by poiana
parent 0de617a7fb
commit 4b75f213c6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
userspace/engine/rule_loader.cpp
View File

@ -21,7 +21,12 @@ limitations under the License.
#include "filter_evttype_resolver.h" #include "filter_evttype_resolver.h"
#include "filter_warning_resolver.h" #include "filter_warning_resolver.h"
#include <version.h> #include <version.h>
#include <regex.h>
#ifndef _WIN32
#include <onigposix.h>
#else // _WIN32
#include <regex>
#endif // _WIN32
#define MAX_VISIBILITY ((uint32_t) -1) #define MAX_VISIBILITY ((uint32_t) -1)
@ -756,8 +761,8 @@ struct list_inserter
using list_info_t = rule_loader::list_info; using list_info_t = rule_loader::list_info;
using lists_map_t = indexed_vector<list_info_t>; using lists_map_t = indexed_vector<list_info_t>;
constexpr static const char* list_full = R"([\(][^()]+[\)])"; constexpr static const char* list_full = "\\([^\\(\\)]+\\)";
constexpr static const char* list_sub = { "[^" LIST_DELMS "]+"}; constexpr static const char* list_sub = { "[^" LIST_DELMS "]+"};
const delim_chars delims{LIST_DELMS}; const delim_chars delims{LIST_DELMS};
@ -791,7 +796,7 @@ struct list_inserter
size_t start = 0; size_t start = 0;
bool first = true; bool first = true;
while (start < cond.size() && regexec(&re_sub, cond.c_str() + start, 1, &re_match, 0) == 0) while (start < cond.size() && regexec(const_cast<regex_t*>(&re_sub), cond.c_str() + start, 1, &re_match, 0) == 0)
{ {
ret += cond.substr(start, re_match.rm_so); ret += cond.substr(start, re_match.rm_so);
@ -859,7 +864,7 @@ struct list_inserter
std::string ret; std::string ret;
regmatch_t re_match; regmatch_t re_match;
size_t start = 0; size_t start = 0;
while (start < cond.size() && regexec(&re_list, cond.c_str() + start, 1, &re_match, 0)==0) while (start < cond.size() && regexec(const_cast<regex_t*>(&re_list), cond.c_str() + start, 1, &re_match, 0)==0)
{ {
ret += cond.substr(start, re_match.rm_so); ret += cond.substr(start, re_match.rm_so);
ret += "("; ret += "(";