This commit is contained in:
Justin Bertram 2017-10-25 10:22:15 -05:00
commit ec9779786f
2 changed files with 44 additions and 0 deletions

View File

@ -146,6 +146,9 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
public static SimpleString readSimpleString(ByteBuf buffer) {
int len = buffer.readInt();
if (len > buffer.readableBytes()) {
throw new IndexOutOfBoundsException();
}
byte[] data = new byte[len];
buffer.readBytes(data);
return new SimpleString(data);

View File

@ -0,0 +1,41 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF 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.apache.activemq.artemis.utils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
public class SimpleStringTest {
@Test
public void testOutOfBoundsThrownOnMalformedString() {
ByteBuf byteBuffer = ByteBufAllocator.DEFAULT.buffer(5);
byteBuffer.writeInt(100);
Exception e = null;
try {
SimpleString.readSimpleString(byteBuffer);
} catch (IndexOutOfBoundsException iob) {
e = iob;
}
assertTrue(e instanceof IndexOutOfBoundsException);
}
}