github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-17 01:51:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics: address cppcheck warnings on src/operators

Browse Source
This commit is contained in:
Felipe Zimmerle
2020-01-23 08:10:05 -03:00
parent 9101a8ab15
commit ff590174da
27 changed files with 120 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/operators/verify_svnr.cc
View File

@@ -11,8 +11,8 @@
namespace modsecurity {
namespace operators {
int VerifySVNR::convert_to_int(const char c)
{
int VerifySVNR::convert_to_int(const char c) {
int n;
if ((c>='0') && (c<='9'))
n = c - '0';
@@ -21,28 +21,18 @@ int VerifySVNR::convert_to_int(const char c)
return n;
}
bool VerifySVNR::verify(const char *svnrnumber, int len) {
int var_len = len;
int sum = 0;
unsigned int i = 0, svnr_len = 10;
int svnr[11];
char s_svnr[11];
char bad_svnr[12][11] = { "0000000000",
"0123456789",
"1234567890",
"1111111111",
"2222222222",
"3333333333",
"4444444444",
"5555555555",
"6666666666",
"7777777777",
"8888888888",
"9999999999"};
while ((*svnrnumber != '\0') && ( var_len > 0))
{
if (*svnrnumber != '-' || *svnrnumber != '.')
// Always true on the original code.
//if (*svnrnumber != '-' || *svnrnumber != '.')
{
if (i < svnr_len && isdigit(*svnrnumber))
{
@@ -98,15 +88,15 @@ bool VerifySVNR::evaluate(Transaction *t, Rule *rule,
for (i = 0; i < input.size() - 1 && is_svnr == false; i++) {
matches = m_re->searchAll(input.substr(i, input.size()));
for (const auto & i : matches) {
is_svnr = verify(i.str().c_str(), i.str().size());
for (const auto & j : matches) {
is_svnr = verify(j.str().c_str(), j.str().size());
if (is_svnr) {
logOffset(ruleMessage, i.offset(), i.str().size());
logOffset(ruleMessage, j.offset(), j.str().size());
if (rule && t && rule->m_containsCaptureAction) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", i.str());
"0", j.str());
ms_dbg_a(t, 7, "Added VerifySVNR match TX.0: " + \
i.str());
j.str());
}
goto out;