diff --git a/headers/modsecurity/rules_set_properties.h b/headers/modsecurity/rules_set_properties.h index 77b112698c..643abce834 100644 --- a/headers/modsecurity/rules_set_properties.h +++ b/headers/modsecurity/rules_set_properties.h @@ -333,9 +333,9 @@ class RulesSetProperties { case FalseConfigBoolean: return "False"; case PropertyNotSetConfigBoolean: + default: return "Not set"; } - return NULL; } diff --git a/src/actions/transformations/url_encode.cc b/src/actions/transformations/url_encode.cc index 19ecb3349d..056755ca2d 100644 --- a/src/actions/transformations/url_encode.cc +++ b/src/actions/transformations/url_encode.cc @@ -48,7 +48,7 @@ std::string UrlEncode::url_enc(const char *input, len = input_len * 3 + 1; d = rval = reinterpret_cast(malloc(len)); if (rval == NULL) { - return NULL; + return {}; } /* ENH Only encode the characters that really need to be encoded. */