Merge pull request #3220 from eduar-hte/string-null

airween · web-flow · commit 7bdc3c825c3a · 2024-08-09T17:37:47.000+02:00
Creating a std::string with a null pointer is undefined behaviour
diff --git 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
@@ -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. */

Original file line number	Diff line number	Diff line change
`@@ -333,9 +333,9 @@ class RulesSetProperties {`
`333`	`333`	`case FalseConfigBoolean:`
`334`	`334`	`return "False";`
`335`	`335`	`case PropertyNotSetConfigBoolean:`
	`336`	`+ default:`
`336`	`337`	`return "Not set";`
`337`	`338`	`}`
`338`		`- return NULL;`
`339`	`339`	`}`
`340`	`340`
`341`	`341`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ std::string UrlEncode::url_enc(const char *input,`
`48`	`48`	`len = input_len * 3 + 1;`
`49`	`49`	`d = rval = reinterpret_cast<char *>(malloc(len));`
`50`	`50`	`if (rval == NULL) {`
`51`		`- return NULL;`
	`51`	`+ return {};`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/* ENH Only encode the characters that really need to be encoded. */`