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

NETTY-425 ChannelBuffers.compare does not handle unsigned bytes correctly

Browse Source 
* Fixed a bug where signed comparison is made where unsigned comparison is expected
This commit is contained in:
Trustin Lee 2011-08-01 04:28:08 +09:00
parent dfd7b0d6c3
commit acb1ac84e6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
View File

@ -979,8 +979,8 @@ public class ChannelBuffers {
} }
for (int i = byteCount; i > 0; i --) { for (int i = byteCount; i > 0; i --) {
byte va = bufferA.getByte(aIndex); short va = bufferA.getUnsignedByte(aIndex);
byte vb = bufferB.getByte(bIndex); short vb = bufferB.getUnsignedByte(bIndex);
if (va > vb) { if (va > vb) {
return 1; return 1;
} else if (va < vb) { } else if (va < vb) {

13
src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
View File

@ -200,6 +200,19 @@ public class ChannelBuffersTest {
assertSame(EMPTY_BUFFER, copiedBuffer(new ChannelBuffer[] { buffer(0), buffer(0) })); assertSame(EMPTY_BUFFER, copiedBuffer(new ChannelBuffer[] { buffer(0), buffer(0) }));
} }
@Test
public void testCompare2() {
assertTrue(ChannelBuffers.compare(
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}),
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00}))
> 0);
assertTrue(ChannelBuffers.compare(
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0xFF}),
ChannelBuffers.wrappedBuffer(new byte[]{(byte) 0x00}))
> 0);
}
@Test(expected = NullPointerException.class) @Test(expected = NullPointerException.class)
public void shouldDisallowNullEndian1() { public void shouldDisallowNullEndian1() {
buffer(null, 0); buffer(null, 0);