Skip to content

Commit

Permalink
Merge pull request #3220 from eduar-hte/string-null
Browse files Browse the repository at this point in the history
Creating a std::string with a null pointer is undefined behaviour
  • Loading branch information
airween authored Aug 9, 2024
2 parents 3a83196 + 30a68de commit 7bdc3c8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion headers/modsecurity/rules_set_properties.h
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,9 @@ class RulesSetProperties {
case FalseConfigBoolean:
return "False";
case PropertyNotSetConfigBoolean:
default:
return "Not set";
}
return NULL;
}


Expand Down
2 changes: 1 addition & 1 deletion src/actions/transformations/url_encode.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ std::string UrlEncode::url_enc(const char *input,
len = input_len * 3 + 1;
d = rval = reinterpret_cast<char *>(malloc(len));
if (rval == NULL) {
return NULL;
return {};
}

/* ENH Only encode the characters that really need to be encoded. */
Expand Down

0 comments on commit 7bdc3c8

Please sign in to comment.