Skip to content

[LANG-1828] Fix OOM in StringUtils.leftPad/rightPad when size is Integer.MIN_VALUE #1736

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

Closed
dhruvaggarwal2000 wants to merge 1 commit into from
+18 −0
Closed

[LANG-1828] Fix OOM in StringUtils.leftPad/rightPad when size is Integer.MIN_VALUE #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 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 @@ -5197,6 +5197,9 @@ public static String leftPad(final String str, final int size, final char padCha
if (str == null) {
return null;
}
if (size <= str.length()) {
return str;
}
final int pads = size - str.length();
if (pads <= 0) {
return str; // returns original String when possible
Expand Down Expand Up @@ -5235,6 +5238,9 @@ public static String leftPad(final String str, final int size, String padStr) {
if (str == null) {
return null;
}
if (size <= str.length()) {
return str;
}
if (isEmpty(padStr)) {
padStr = SPACE;
}
Expand Down Expand Up @@ -6991,6 +6997,9 @@ public static String rightPad(final String str, final int size, final char padCh
if (str == null) {
return null;
}
if (size <= str.length()) {
return str;
}
final int pads = size - str.length();
if (pads <= 0) {
return str; // returns original String when possible
Expand Down Expand Up @@ -7029,6 +7038,9 @@ public static String rightPad(final String str, final int size, String padStr) {
if (str == null) {
return null;
}
if (size <= str.length()) {
return str;
}
if (isEmpty(padStr)) {
padStr = SPACE;
}
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/apache/commons/lang3/StringUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,7 @@ void testLeftPad_StringInt() {
assertEquals(" ", StringUtils.leftPad("", 5));
assertEquals(" abc", StringUtils.leftPad("abc", 5));
assertEquals("abc", StringUtils.leftPad("abc", 2));
assertEquals("abc", StringUtils.leftPad("abc", Integer.MIN_VALUE));
}

@Test
Expand All @@ -1333,6 +1334,7 @@ void testLeftPad_StringIntChar() {
assertEquals("xxabc", StringUtils.leftPad("abc", 5, 'x'));
assertEquals("\uffff\uffffabc", StringUtils.leftPad("abc", 5, '\uffff'));
assertEquals("abc", StringUtils.leftPad("abc", 2, ' '));
assertEquals("abc", StringUtils.leftPad("abc", Integer.MIN_VALUE, ' '));
final String str = StringUtils.leftPad("aaa", 10000, 'a'); // bigger than pad length
assertEquals(10000, str.length());
assertTrue(StringUtils.containsOnly(str, 'a'));
Expand All @@ -1350,6 +1352,7 @@ void testLeftPad_StringIntString() {
assertEquals("abc", StringUtils.leftPad("abc", -1, " "));
assertEquals(" abc", StringUtils.leftPad("abc", 5, null));
assertEquals(" abc", StringUtils.leftPad("abc", 5, ""));
assertEquals("abc", StringUtils.leftPad("abc", Integer.MIN_VALUE, " "));
}

@Test
Expand Down Expand Up @@ -2202,6 +2205,7 @@ void testRightPad_StringInt() {
assertEquals("abc ", StringUtils.rightPad("abc", 5));
assertEquals("abc", StringUtils.rightPad("abc", 2));
assertEquals("abc", StringUtils.rightPad("abc", -1));
assertEquals("abc", StringUtils.rightPad("abc", Integer.MIN_VALUE));
}

@Test
Expand All @@ -2212,6 +2216,7 @@ void testRightPad_StringIntChar() {
assertEquals("abc", StringUtils.rightPad("abc", 2, ' '));
assertEquals("abc", StringUtils.rightPad("abc", -1, ' '));
assertEquals("abcxx", StringUtils.rightPad("abc", 5, 'x'));
assertEquals("abc", StringUtils.rightPad("abc", Integer.MIN_VALUE, ' '));
final String str = StringUtils.rightPad("aaa", 10000, 'a'); // bigger than pad length
assertEquals(10000, str.length());
assertTrue(StringUtils.containsOnly(str, 'a'));
Expand All @@ -2229,6 +2234,7 @@ void testRightPad_StringIntString() {
assertEquals("abc", StringUtils.rightPad("abc", -1, " "));
assertEquals("abc ", StringUtils.rightPad("abc", 5, null));
assertEquals("abc ", StringUtils.rightPad("abc", 5, ""));
assertEquals("abc", StringUtils.rightPad("abc", Integer.MIN_VALUE, " "));
}

@Test
Expand Down