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

Cosmetics: fix cppcheck warnings

Browse Source
This commit is contained in:
Felipe Zimmerle 2020-10-22 10:08:35 -03:00
parent 8da787a390
commit 4b425850cf
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -59,7 +59,7 @@ cppcheck:
@cppcheck -U YYSTYPE -U MBEDTLS_MD5_ALT -U MBEDTLS_SHA1_ALT \
-D MS_CPPCHECK_DISABLED_FOR_PARSER \
--suppressions-list=./test/cppcheck_suppressions.txt \
--enable=all \
--enable=warning,style,performance,portability,unusedFunction,missingInclude \
--inconclusive \
--template="warning: {file},{line},{severity},{id},{message}" \
-I headers -I . -I others -I src -I others/mbedtls -I src/parser \

6
src/modsecurity.cc
View File

@ -256,7 +256,7 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
strlen("highlight"));
yajl_gen_array_open(g);
while (vars.size() > 0) {
while (vars.size() > 3) {
std::string value;
yajl_gen_map_open(g);
vars.pop_back();
@ -303,7 +303,7 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
varValue.size());
yajl_gen_map_close(g);
while (trans.size() > 0) {
while (!trans.empty()) {
modsecurity::actions::transformations::Transformation *t;
std::string varValueRes;
yajl_gen_map_open(g);
@ -338,7 +338,7 @@ int ModSecurity::processContentOffset(const char *content, size_t len,
yajl_gen_map_open(g);
while (ops.size() > 0) {
while (ops.size() > 3) {
std::string value;
yajl_gen_string(g, reinterpret_cast<const unsigned char*>("highlight"),
strlen("highlight"));

4
src/request_body_processor/json.cc
View File

@ -232,7 +232,7 @@ int JSON::yajl_start_array(void *ctx) {
int JSON::yajl_end_array(void *ctx) {
JSON *tthis = reinterpret_cast<JSON *>(ctx);
if (tthis->m_containers.size() <= 0) {
if (tthis->m_containers.empty()) {
return 1;
}
@ -266,7 +266,7 @@ int JSON::yajl_start_map(void *ctx) {
*/
int JSON::yajl_end_map(void *ctx) {
JSON *tthis = reinterpret_cast<JSON *>(ctx);
if (tthis->m_containers.size() <= 0) {
if (tthis->m_containers.empty()) {
return 1;
}

4
src/utils/geo_lookup.cc
View File

@ -91,11 +91,11 @@ bool GeoLookup::setDataBase(const std::string& filePath,
#endif
err->append(".");
if (intMax.size() > 0) {
if (!intMax.empty()) {
err->append(" " + intMax);
}
if (intGeo.size() > 0) {
if (!intGeo.empty()) {
err->append(" " + intGeo);
}
return false;

1
src/variables/web_app_id.h
View File

@ -38,7 +38,6 @@ class WebAppId : public Variable {
void evaluate(Transaction *transaction,
RuleWithActions *rule,
std::vector<const VariableValue *> *l) override {
const std::string name("WEBAPPID");
const std::string rname = transaction->m_rules->m_secWebAppId.m_value;
l->push_back(new VariableValue(&m_name, &rname));
}

4
test/cppcheck_suppressions.txt
View File

@ -51,6 +51,9 @@ duplicateBranch:src/request_body_processor/multipart.cc:91
syntaxError:src/transaction.cc:62
noConstructor:src/variables/variable.h:152
duplicateBranch:src/request_body_processor/multipart.cc:93
knownConditionTrueFalse:src/utils/geo_lookup.cc:94
knownConditionTrueFalse:src/utils/geo_lookup.cc:98
danglingTempReference:src/modsecurity.cc:204
noExplicitConstructor:seclang-parser.hh
@ -61,3 +64,4 @@ preprocessorErrorDirective
funcArgNamesDifferent
unmatchedSuppression
missingInclude