Skip to content

Fix handling of null marker in StringUtils.abbreviate(String, String, int, int) #1571

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

Merged
garydgregory merged 2 commits into from
Jan 17, 2026
Merged

Fix handling of null marker in StringUtils.abbreviate(String, String, int, int) #1571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69df22c
add unit tests showing mishandling of null abbrevMarker
ThrawnCA Jan 17, 2026
1ca5aeb
fix handling of null abbrevMarker
ThrawnCA Jan 17, 2026
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
10 changes: 5 additions & 5 deletions src/main/java/org/apache/commons/lang3/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,13 @@ public static String abbreviate(final String str, final String abbrevMarker, fin
* @throws IllegalArgumentException if the width is too small.
* @since 3.6
*/
public static String abbreviate(final String str, final String abbrevMarker, int offset, final int maxWidth) {
if (isNotEmpty(str) && EMPTY.equals(abbrevMarker) && maxWidth > 0) {
return substring(str, 0, maxWidth);
}
if (isAnyEmpty(str, abbrevMarker)) {
public static String abbreviate(final String str, String abbrevMarker, int offset, final int maxWidth) {
if (isEmpty(str)) {
return str;
}
if (abbrevMarker == null) {
abbrevMarker = EMPTY;
}
final int abbrevMarkerLength = abbrevMarker.length();
final int minAbbrevWidth = abbrevMarkerLength + 1;
final int minAbbrevWidthOffset = abbrevMarkerLength + abbrevMarkerLength + 1;
Expand Down
8 changes: 7 additions & 1 deletion src/test/java/org/apache/commons/lang3/StringUtilsAbbreviateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void testAbbreviate_StringIntInt() {
void testAbbreviate_StringStringInt() {
assertNull(StringUtils.abbreviate(null, null, 10));
assertNull(StringUtils.abbreviate(null, "...", 10));
assertEquals("paranaguacu", StringUtils.abbreviate("paranaguacu", null, 10));
assertEquals("paranaguac", StringUtils.abbreviate("paranaguacu", null, 10));
assertEquals("", StringUtils.abbreviate("", "...", 2));
assertEquals("wai**", StringUtils.abbreviate("waiheke", "**", 5));
assertEquals("And af,,,,", StringUtils.abbreviate("And after a long time, he finally met his son.", ",,,,", 10));
Expand All @@ -130,6 +130,12 @@ void testAbbreviate_StringStringIntInt() {
assertNull(StringUtils.abbreviate(null, "...", 10, 12));
assertEquals("", StringUtils.abbreviate("", null, 0, 10));
assertEquals("", StringUtils.abbreviate("", "...", 2, 10));
assertEquals("abcdefg", StringUtils.abbreviate("abcdefg", null, 2, 10));
assertEquals("abcdefg", StringUtils.abbreviate("abcdefg", "", 2, 10));
assertEquals("abc", StringUtils.abbreviate("abcdefg", null, 0, 3));
assertEquals("cde", StringUtils.abbreviate("abcdefg", null, 2, 3));
assertEquals("abc", StringUtils.abbreviate("abcdefg", "", 0, 3));
assertEquals("cde", StringUtils.abbreviate("abcdefg", "", 2, 3));
assertIllegalArgumentException(() -> StringUtils.abbreviate("abcdefghij", "::", 0, 2),
"StringUtils.abbreviate expecting IllegalArgumentException");
assertIllegalArgumentException(() -> StringUtils.abbreviate("abcdefghij", "!!!", 5, 6),
Expand Down