andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AsciiString#indexOf out of bounds (#7866)

Browse Source 
Motivation:
The bounds checking for AsciiString#indexOf and AsciiString#lastIndexOf is not correct and may lead to ArrayIndexOutOfBoundsException.

Modifications:
- Correct the bounds checking for AsciiString#indexOf and AsciiString#lastIndexOf

Result
Fixes https://github.com/netty/netty/issues/7863
This commit is contained in:
Scott Mitchell 2018-04-12 12:06:12 -07:00 committed by GitHub
parent 401b196623
commit 3f244a94fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/io/netty/util/AsciiString.java
View File

@ -688,7 +688,7 @@ public final class AsciiString implements CharSequence, Comparable<CharSequence>
return INDEX_NOT_FOUND;
}
final byte firstCharAsByte = c2b0(firstChar);
final int len = offset + start + length - subCount;
final int len = offset + length - subCount;
for (int i = start + offset; i <= len; ++i) {
if (value[i] == firstCharAsByte) {
int o1 = i, o2 = 0;
@ -773,7 +773,7 @@ public final class AsciiString implements CharSequence, Comparable<CharSequence>
}
final byte firstCharAsByte = c2b0(firstChar);
final int end = offset + start;
for (int i = offset + start + length - subCount; i >= end; --i) {
for (int i = offset + length - subCount; i >= end; --i) {
if (value[i] == firstCharAsByte) {
int o1 = i, o2 = 0;
while (++o2 < subCount && b2c(value[++o1]) == subString.charAt(o2)) {

17
common/src/test/java/io/netty/util/AsciiStringCharacterTest.java
View File

@ -15,7 +15,6 @@
*/
package io.netty.util;
import org.junit.Assert;
import org.junit.Test;
import java.nio.CharBuffer;
@ -87,7 +86,7 @@ public class AsciiStringCharacterTest {
public void testComparisonWithString() {
String string = "shouldn't fail";
AsciiString ascii = new AsciiString(string.toCharArray());
Assert.assertEquals(string, ascii.toString());
assertEquals(string, ascii.toString());
}
@Test
@ -319,6 +318,8 @@ public class AsciiStringCharacterTest {
assertEquals(0, new AsciiString("abcd", 1, 2).indexOf("bc", 0));
assertEquals(0, new AsciiString("abcd", 1, 3).indexOf("bcd", 0));
assertEquals(1, new AsciiString("abcdabcd", 4, 4).indexOf("bcd", 0));
assertEquals(3, new AsciiString("012345").indexOf("345", 3));
assertEquals(3, new AsciiString("012345").indexOf("345", 0));
// Test with empty string
assertEquals(0, new AsciiString("abcd").indexOf("", 0));
@ -330,6 +331,11 @@ public class AsciiStringCharacterTest {
assertEquals(-1, new AsciiString("abcdbc").indexOf("bce", 0));
assertEquals(-1, new AsciiString("abcd", 1, 3).indexOf("abc", 0));
assertEquals(-1, new AsciiString("abcd", 1, 2).indexOf("bd", 0));
assertEquals(-1, new AsciiString("012345").indexOf("345", 4));
assertEquals(-1, new AsciiString("012345").indexOf("abc", 3));
assertEquals(-1, new AsciiString("012345").indexOf("abc", 0));
assertEquals(-1, new AsciiString("012345").indexOf("abcdefghi", 0));
assertEquals(-1, new AsciiString("012345").indexOf("abcdefghi", 4));
}
@Test
@ -354,6 +360,8 @@ public class AsciiStringCharacterTest {
assertEquals(0, new AsciiString("abcd", 1, 2).lastIndexOf("bc", 0));
assertEquals(0, new AsciiString("abcd", 1, 3).lastIndexOf("bcd", 0));
assertEquals(1, new AsciiString("abcdabcd", 4, 4).lastIndexOf("bcd", 0));
assertEquals(3, new AsciiString("012345").lastIndexOf("345", 3));
assertEquals(3, new AsciiString("012345").lastIndexOf("345", 0));
// Test with empty string
assertEquals(0, new AsciiString("abcd").lastIndexOf("", 0));
@ -365,6 +373,11 @@ public class AsciiStringCharacterTest {
assertEquals(-1, new AsciiString("abcdbc").lastIndexOf("bce", 0));
assertEquals(-1, new AsciiString("abcd", 1, 3).lastIndexOf("abc", 0));
assertEquals(-1, new AsciiString("abcd", 1, 2).lastIndexOf("bd", 0));
assertEquals(-1, new AsciiString("012345").lastIndexOf("345", 4));
assertEquals(-1, new AsciiString("012345").lastIndexOf("abc", 3));
assertEquals(-1, new AsciiString("012345").lastIndexOf("abc", 0));
assertEquals(-1, new AsciiString("012345").lastIndexOf("abcdefghi", 0));
assertEquals(-1, new AsciiString("012345").lastIndexOf("abcdefghi", 4));
}
@Test