Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed handling of null 'replacement' parameter in RegexReplacement#createRegexReplacement #3457

Open
wants to merge 2 commits into
base: 2.x
Choose a base branch
from
Open

Fixed handling of null 'replacement' parameter in RegexReplacement#createRegexReplacement #3457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2c3ba
Fixed handling of null 'replacement' parameter in RegexReplacement#cr…
jethomas-tsi Feb 11, 2025
59bc4b5
Moved changelog to .2.x.x per PR Code Review (#3215)
jethomas-tsi Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public String toString() {
* Create a RegexReplacement.
* @param regex The regular expression to locate.
* @param replacement The replacement value.
* @return A RegexReplacement.
* @return the new RegexReplacement instance or {@code null} if an input parameter was invalid
*/
@PluginFactory
public static RegexReplacement createRegexReplacement(
Expand All @@ -76,6 +76,7 @@ public static RegexReplacement createRegexReplacement(
}
if (replacement == null) {
LOGGER.error("A replacement string is required to perform replacement");
return null;
}
// FIXME: should we use Matcher.quoteReplacement() here?
return new RegexReplacement(regex, replacement);
Expand Down
10 changes: 10 additions & 0 deletions src/changelog/2.25.0/3215_fix-RegexReplacement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://logging.apache.org/xml/ns"
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
type="fixed">
<issue id="3215" link="https://github.com/apache/logging-log4j2/issues/3215"/>
<description format="asciidoc">
Properly handle null 'replacement' parameter in RegexReplacement#createRegexReplacement.
</description>
</entry>
Loading