mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-29 11:16:33 +03:00
Removes some warnings by adding missing returns
This commit is contained in:
@@ -93,8 +93,9 @@ bool Pm::init(const char **error) {
|
||||
acmp_add_pattern(m_p, a.c_str(), NULL, NULL, a.length());
|
||||
}
|
||||
|
||||
|
||||
acmp_prepare(m_p);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -44,12 +44,11 @@ bool Multipart::init() {
|
||||
}
|
||||
|
||||
std::size_t boundary_pos = m_header.find("boundary");
|
||||
if (boundary_pos < 0) {
|
||||
if (boundary_pos > 0 && m_header.find("boundary", boundary_pos) > 0) {
|
||||
debug(4, "Multipart: Multiple boundary parameters in " \
|
||||
"Content-Type.");
|
||||
return false;
|
||||
}
|
||||
if (boundary_pos != std::string::npos &&
|
||||
m_header.find("boundary", boundary_pos + 1) != std::string::npos) {
|
||||
debug(4, "Multipart: Multiple boundary parameters in " \
|
||||
"Content-Type.");
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string boundary = m_header.c_str() + boundary_pos;
|
||||
|
@@ -70,6 +70,8 @@ bool MultipartBlob::processContent() {
|
||||
offset = end + 1;
|
||||
}
|
||||
content = std::string(m_blob, offset, m_blob.length() - offset + 1);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -123,6 +125,8 @@ bool MultipartBlob::processContentDispositionLine(
|
||||
filename = std::string(dispositionLine, offset, end - offset);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -52,7 +52,7 @@ char *parse_pm_content(const char *op_parm, unsigned short int op_len, const cha
|
||||
return NULL;
|
||||
}
|
||||
|
||||
while (offset < op_len && content[offset] == ' ' || content[offset] == '\t') {
|
||||
while (offset < op_len && (content[offset] == ' ' || content[offset] == '\t')) {
|
||||
offset++;
|
||||
};
|
||||
|
||||
@@ -380,7 +380,7 @@ static int acmp_connect_fail_branches(ACMP *parser) {
|
||||
std::vector<acmp_node_t *> arr2;
|
||||
std::vector<acmp_node_t *> tmp;
|
||||
|
||||
parser->root_node->text = "";
|
||||
parser->root_node->text = (char *)"";
|
||||
|
||||
parser->root_node->fail = parser->root_node;
|
||||
|
||||
@@ -496,7 +496,7 @@ if (parser->is_active != 0) return -1;
|
||||
if (child == NULL) {
|
||||
child = (acmp_node_t *) calloc(1, sizeof(acmp_node_t));
|
||||
/* ENH: Check alloc succeded */
|
||||
child->pattern = "";
|
||||
child->pattern = (char *)"";
|
||||
child->letter = letter;
|
||||
child->depth = i;
|
||||
child->text = (char *)calloc(1, strlen(pattern) + 2);
|
||||
|
@@ -59,19 +59,19 @@ documentation and/or software.
|
||||
|
||||
// F, G, H and I are basic MD5 functions.
|
||||
inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
|
||||
return x&y | ~x&z;
|
||||
return (x & y) | (~x & z);
|
||||
}
|
||||
|
||||
inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
|
||||
return x&z | y&~z;
|
||||
return (x & z) | (y & ~z);
|
||||
}
|
||||
|
||||
inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
|
||||
return x^y^z;
|
||||
return (x ^ y ^ z);
|
||||
}
|
||||
|
||||
inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
|
||||
return y ^ (x | ~z);
|
||||
return (y ^ (x | ~z));
|
||||
}
|
||||
|
||||
// rotate_left rotates x left n bits.
|
||||
|
Reference in New Issue
Block a user