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

Fix invalid memory read in msc_tree

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-06-16 13:31:31 -03:00
parent 8b9041c2da
commit 21777aec41
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/msc_tree.cc
View File

@ -107,7 +107,7 @@ TreePrefix *CPTCreatePrefix(unsigned char *ipdata, unsigned int ip_bitmask,
unsigned char netmask) { unsigned char netmask) {
TreePrefix *prefix = NULL; TreePrefix *prefix = NULL;
int bytes = ip_bitmask/8; int bytes = ip_bitmask;
if ((ip_bitmask % 8 != 0) || (ipdata == NULL)) { if ((ip_bitmask % 8 != 0) || (ipdata == NULL)) {
return NULL; return NULL;
@ -759,7 +759,6 @@ TreeNode *CPTFindElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
return node; return node;
} }
} }
if ((node->prefix->buffer[bytes] & mask) == (temp_data[bytes] & mask)) { if ((node->prefix->buffer[bytes] & mask) == (temp_data[bytes] & mask)) {
if (TreePrefixNetmask(node->prefix, ip_bitmask, TRUE)) { if (TreePrefixNetmask(node->prefix, ip_bitmask, TRUE)) {
//if (msr && msr->txcfg->debuglog_level >= 9) { //if (msr && msr->txcfg->debuglog_level >= 9) {