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

Fix assorted minor memory management issues

Browse Source
This commit is contained in:
Felipe Zimmerle 2017-11-14 09:36:32 -03:00
parent b7698d6899
commit 9c0ed6109d
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 74 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/engine/lua.cc
View File

@ -122,6 +122,8 @@ const char *Lua::blob_reader(lua_State *L, void *ud, size_t *size) {
int Lua::run(Transaction *t) { int Lua::run(Transaction *t) {
#ifdef WITH_LUA #ifdef WITH_LUA
std::string luaRet; std::string luaRet;
const char *a = NULL;
int ret = true;
lua_State *L = luaL_newstate(); lua_State *L = luaL_newstate();
luaL_openlibs(L); luaL_openlibs(L);
@ -152,7 +154,8 @@ int Lua::run(Transaction *t) {
} }
e.append(lua_tostring(L, -1)); e.append(lua_tostring(L, -1));
t->debug(2, e); t->debug(2, e);
return false; ret = false;
goto err;
} }
if (lua_pcall(L, 0, 0, 0)) { if (lua_pcall(L, 0, 0, 0)) {
@ -165,7 +168,8 @@ int Lua::run(Transaction *t) {
e.append(luaerr); e.append(luaerr);
} }
t->debug(2, e); t->debug(2, e);
return false; ret = false;
goto err;
} }
lua_setglobal(L, "modsec"); lua_setglobal(L, "modsec");
@ -180,24 +184,27 @@ int Lua::run(Transaction *t) {
e.append(luaerr); e.append(luaerr);
} }
t->debug(2, e); t->debug(2, e);
return false; ret = false;
goto err;
} }
const char *a = reinterpret_cast<const char *>(lua_tostring(L, -1)); a = reinterpret_cast<const char *>(lua_tostring(L, -1));
if (a != NULL) { if (a != NULL) {
luaRet.assign(a); luaRet.assign(a);
} }
t->debug(9, "Returning from lua script: " + luaRet); t->debug(9, "Returning from lua script: " + luaRet);
if (luaRet.size() == 0) {
ret = false;
}
err:
lua_pop(L, 1); lua_pop(L, 1);
lua_close(L); lua_close(L);
if (luaRet.size() == 0) { return ret;
return false;
}
return true;
#else #else
t->debug(9, "Lua support was not enabled."); t->debug(9, "Lua support was not enabled.");
return false; return false;
@ -287,6 +294,10 @@ int Lua::getvars(lua_State *L) {
idx++; idx++;
} }
for (const collection::Variable * i : l) {
delete i;
}
return 1; return 1;
} }
@ -372,6 +383,7 @@ std::string Lua::applyTransformations(lua_State *L, Transaction *t,
t->debug(1, "SecRuleScript: Invalid transformation function: " \ t->debug(1, "SecRuleScript: Invalid transformation function: " \
+ std::string(name)); + std::string(name));
} }
delete tfn;
} }
return newVar; return newVar;
@ -388,6 +400,7 @@ std::string Lua::applyTransformations(lua_State *L, Transaction *t,
// FIXME: transformation is not yet returning null. // FIXME: transformation is not yet returning null.
if (tfn) { if (tfn) {
newVar = tfn->evaluate(newVar, t); newVar = tfn->evaluate(newVar, t);
delete tfn;
} else { } else {
t->debug(1, "SecRuleScript: Invalid transformation function: " \ t->debug(1, "SecRuleScript: Invalid transformation function: " \
+ std::string(name)); + std::string(name));

2
src/operators/fuzzy_hash.cc
View File

@ -91,7 +91,7 @@ FuzzyHash::~FuzzyHash() {
free(c->data); free(c->data);
c->data = NULL; c->data = NULL;
c = c->next; c = c->next;
free (t); free(t);
} }
m_head = NULL; m_head = NULL;
} }

51
test/valgrind_suppressions.txt
View File

@ -3771,4 +3771,55 @@
fun:_Z17perform_unit_testPN16modsecurity_test15ModSecurityTestINS_14RegressionTestEEEPSt6vectorIPS1_SaIS5_EEPNS_22ModSecurityTestResultsINS_20RegressionTestResultEEEPi fun:_Z17perform_unit_testPN16modsecurity_test15ModSecurityTestINS_14RegressionTestEEEPSt6vectorIPS1_SaIS5_EEPNS_22ModSecurityTestResultsINS_20RegressionTestResultEEEPi
fun:main fun:main
} }
{
<insert_a_suppression_name_here>
Memcheck:Leak
match-leak-kinds: definite
fun:realloc
fun:write
fun:_ZN11modsecurity6engine3Lua11blob_keeperEP9lua_StatePKvmPv
obj:/usr/lib/liblua.so.5.3.4
obj:/usr/lib/liblua.so.5.3.4
obj:/usr/lib/liblua.so.5.3.4
obj:/usr/lib/liblua.so.5.3.4
fun:_ZN11modsecurity6engine3Lua4loadENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS7_
fun:_ZN11modsecurity10RuleScript4initEPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
fun:_ZN2yy14seclang_parser5parseEv
fun:_ZN11modsecurity6Parser6Driver5parseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_
fun:_ZN11modsecurity5Rules4loadEPKcRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
fun:_Z17perform_unit_testPN16modsecurity_test15ModSecurityTestINS_14RegressionTestEEEPSt6vectorIPS1_SaIS5_EEPNS_22ModSecurityTestResultsINS_20RegressionTestResultEEEPi
fun:main
}
{
<insert_a_suppression_name_here>
Memcheck:Leak
match-leak-kinds: definite
fun:_Znwm
fun:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
fun:assign
fun:operator=
fun:_ZN11modsecurity6engine3Lua4loadENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPS7_
fun:_ZN11modsecurity10RuleScript4initEPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
fun:_ZN2yy14seclang_parser5parseEv
fun:_ZN11modsecurity6Parser6Driver5parseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_
fun:_ZN11modsecurity5Rules4loadEPKcRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
fun:_Z17perform_unit_testPN16modsecurity_test15ModSecurityTestINS_14RegressionTestEEEPSt6vectorIPS1_SaIS5_EEPNS_22ModSecurityTestResultsINS_20RegressionTestResultEEEPi
fun:main
}
{
<insert_a_suppression_name_here>
Memcheck:Leak
match-leak-kinds: definite
fun:_Znwm
fun:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag.isra.137
fun:_M_construct_aux<char*>
fun:_M_construct<char*>
fun:basic_string
fun:RuleScript
fun:_ZN2yy14seclang_parser5parseEv
fun:_ZN11modsecurity6Parser6Driver5parseERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_
fun:_ZN11modsecurity5Rules4loadEPKcRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
fun:_Z17perform_unit_testPN16modsecurity_test15ModSecurityTestINS_14RegressionTestEEEPSt6vectorIPS1_SaIS5_EEPNS_22ModSecurityTestResultsINS_20RegressionTestResultEEEPi
fun:main
}