github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

add fallback for JIT_STACKLIMIT

Browse Source
This commit is contained in:
Jabasukuriputo Wang
2022-11-30 23:13:29 +08:00
committed by GitHub
parent 6518973464
commit 1550e3017e
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/operators/verify_cc.cc
View File

@@ -148,8 +148,10 @@ bool VerifyCC::evaluate(Transaction *t, RuleWithActions *rule,
if (m_pcje == 0) { if (m_pcje == 0) {
ret = pcre2_jit_match(m_pc, pcre2_i, target_length, offset, 0, match_data, NULL); ret = pcre2_jit_match(m_pc, pcre2_i, target_length, offset, 0, match_data, NULL);
} else { }
ret = pcre2_match(m_pc, pcre2_i, target_length, offset, 0, match_data, NULL);
if (m_pcje != 0 || ret == PCRE2_ERROR_JIT_STACKLIMIT) {
ret = pcre2_match(m_pc, pcre2_i, target_length, offset, PCRE2_NO_JIT, match_data, NULL);
} }
/* If there was no match, then we are done. */ /* If there was no match, then we are done. */

24
src/utils/regex.cc
View File

@@ -122,9 +122,11 @@ std::list<SMatch> Regex::searchAll(const std::string& s) const {
if (m_pcje == 0) { if (m_pcje == 0) {
rc = pcre2_jit_match(m_pc, pcre2_s, s.length(), rc = pcre2_jit_match(m_pc, pcre2_s, s.length(),
offset, 0, match_data, NULL); offset, 0, match_data, NULL);
} else { }
if (m_pcje != 0 || rc == PCRE2_ERROR_JIT_STACKLIMIT) {
rc = pcre2_match(m_pc, pcre2_s, s.length(), rc = pcre2_match(m_pc, pcre2_s, s.length(),
offset, 0, match_data, NULL); offset, PCRE2_NO_JIT, match_data, NULL);
} }
PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data); PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data);
#else #else
@@ -168,8 +170,10 @@ bool Regex::searchOneMatch(const std::string& s, std::vector<SMatchCapture>& cap
int rc; int rc;
if (m_pcje == 0) { if (m_pcje == 0) {
rc = pcre2_jit_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL); rc = pcre2_jit_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL);
} else { }
rc = pcre2_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL);
if (m_pcje != 0 || rc == PCRE2_ERROR_JIT_STACKLIMIT) {
rc = pcre2_match(m_pc, pcre2_s, s.length(), 0, PCRE2_NO_JIT, match_data, NULL);
} }
PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data); PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data);
#else #else
@@ -285,9 +289,11 @@ int Regex::search(const std::string& s, SMatch *match) const {
if (m_pcje == 0) { if (m_pcje == 0) {
ret = pcre2_match(m_pc, pcre2_s, s.length(), ret = pcre2_match(m_pc, pcre2_s, s.length(),
0, 0, match_data, NULL) > 0; 0, 0, match_data, NULL) > 0;
} else { }
if (m_pcje != 0 || rc == PCRE2_ERROR_JIT_STACKLIMIT) {
ret = pcre2_match(m_pc, pcre2_s, s.length(), ret = pcre2_match(m_pc, pcre2_s, s.length(),
0, 0, match_data, NULL) > 0; 0, PCRE2_NO_JIT, match_data, NULL) > 0;
} }
if (ret > 0) { // match if (ret > 0) { // match
PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data); PCRE2_SIZE *ovector = pcre2_get_ovector_pointer(match_data);
@@ -316,8 +322,10 @@ int Regex::search(const std::string& s) const {
int rc; int rc;
if (m_pcje == 0) { if (m_pcje == 0) {
rc = pcre2_jit_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL); rc = pcre2_jit_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL);
} else { }
rc = pcre2_match(m_pc, pcre2_s, s.length(), 0, 0, match_data, NULL);
if (m_pcje != 0 || rc == PCRE2_ERROR_JIT_STACKLIMIT) {
rc = pcre2_match(m_pc, pcre2_s, s.length(), 0, PCRE2_NO_JIT, match_data, NULL);
} }
pcre2_match_data_free(match_data); pcre2_match_data_free(match_data);
if (rc > 0) { if (rc > 0) {