Fix ArrayIndexOutOfBoundsException in ReplayDecoderBuffer which could happen when calling getByte(..) or getUnsignedByte(..). See #445

This commit is contained in:
Norman Maurer 2012-07-08 11:24:26 +02:00
parent 02c0c5b5e9
commit f648aae747
2 changed files with 90 additions and 8 deletions

View File

@ -106,12 +106,12 @@ class ReplayingDecoderBuffer implements ChannelBuffer {
}
public byte getByte(int index) {
checkIndex(index);
checkIndex(index, 1);
return buf().getByte(index);
}
public short getUnsignedByte(int index) {
checkIndex(index);
checkIndex(index, 1);
return buf().getUnsignedByte(index);
}
@ -691,12 +691,6 @@ class ReplayingDecoderBuffer implements ChannelBuffer {
throw new UnreplayableOperationException();
}
private void checkIndex(int index) {
if (index > buf().writerIndex()) {
throw REPLAY;
}
}
private void checkIndex(int index, int length) {
if (index + length > buf().writerIndex()) {
throw REPLAY;

View File

@ -0,0 +1,88 @@
/*
* Copyright 2012 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package org.jboss.netty.handler.codec.replay;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.util.CharsetUtil;
import org.junit.Test;
public class ReplayingDecoderBufferTest {
/**
* See https://github.com/netty/netty/issues/445
*/
@Test
public void testGetUnsignedByte() {
ReplayingDecoderBuffer buffer = new ReplayingDecoderBuffer(new ReplayDecoderImpl());
boolean error;
int i = 0;
try {
for (;;) {
buffer.getUnsignedByte(i);
i++;
}
} catch (ReplayError e) {
error = true;
}
assertTrue(error);
assertEquals(10, i);
}
/**
* See https://github.com/netty/netty/issues/445
*/
@Test
public void testGetByte() {
ReplayingDecoderBuffer buffer = new ReplayingDecoderBuffer(new ReplayDecoderImpl());
boolean error;
int i = 0;
try {
for (;;) {
buffer.getByte(i);
i++;
}
} catch (ReplayError e) {
error = true;
}
assertTrue(error);
assertEquals(10, i);
}
private class ReplayDecoderImpl extends ReplayingDecoder<VoidEnum> {
private ChannelBuffer internal = ChannelBuffers.copiedBuffer("TestBuffer", CharsetUtil.ISO_8859_1);
@Override
protected ChannelBuffer internalBuffer() {
return internal;
}
@Override
protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer, VoidEnum state)
throws Exception {
throw new UnsupportedOperationException();
}
}
}