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

Checking std::deque size before use it

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-02-06 22:47:24 -03:00
parent eeec7efb68
commit 2b052b0edb
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/request_body_processor/json.cc
View File

@@ -127,14 +127,19 @@ int JSON::addArgument(const std::string& value) {
} }
} }
JSONContainerArray *a = dynamic_cast<JSONContainerArray *>( if (m_containers.size() > 0) {
m_containers.back()); JSONContainerArray *a = dynamic_cast<JSONContainerArray *>(
if (a) { m_containers.back());
a->m_elementCounter++; if (a) {
a->m_elementCounter++;
} else {
data = getCurrentKey();
}
} else { } else {
data = getCurrentKey(); data = getCurrentKey();
} }
m_transaction->addArgument("JSON", path + data, value, 0); m_transaction->addArgument("JSON", path + data, value, 0);
return 1; return 1;
@@ -222,6 +227,10 @@ int JSON::yajl_start_array(void *ctx) {
int JSON::yajl_end_array(void *ctx) { int JSON::yajl_end_array(void *ctx) {
JSON *tthis = reinterpret_cast<JSON *>(ctx); JSON *tthis = reinterpret_cast<JSON *>(ctx);
if (tthis->m_containers.size() <= 0) {
return 1;
}
JSONContainer *a = tthis->m_containers.back(); JSONContainer *a = tthis->m_containers.back();
tthis->m_containers.pop_back(); tthis->m_containers.pop_back();
delete a; delete a;
@@ -252,6 +261,10 @@ int JSON::yajl_start_map(void *ctx) {
*/ */
int JSON::yajl_end_map(void *ctx) { int JSON::yajl_end_map(void *ctx) {
JSON *tthis = reinterpret_cast<JSON *>(ctx); JSON *tthis = reinterpret_cast<JSON *>(ctx);
if (tthis->m_containers.size() <= 0) {
return 1;
}
JSONContainer *a = tthis->m_containers.back(); JSONContainer *a = tthis->m_containers.back();
tthis->m_containers.pop_back(); tthis->m_containers.pop_back();
delete a; delete a;