Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Fix possible IOE 

This array access might be out of bounds, as the index might be equal to the array length.
This commit is contained in:
Michael André Pearce 2019-01-18 08:33:49 +00:00
parent f49d3e89dc
commit 7fe45dea0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
View File

@ -342,7 +342,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
byte high = (byte) (delim >> 8 & 0xFF); // high byte
int lasPos = 0;
for (int i = 0; i < data.length; i += 2) {
for (int i = 0; i + 1 < data.length; i += 2) {
if (data[i] == low && data[i + 1] == high) {
byte[] bytes = new byte[i - lasPos];
System.arraycopy(data, lasPos, bytes, 0, bytes.length);
@ -439,7 +439,7 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
final byte low = (byte) (c & 0xFF); // low byte
final byte high = (byte) (c >> 8 & 0xFF); // high byte
for (int i = 0; i < data.length; i += 2) {
for (int i = 0; i + 1 < data.length; i += 2) {
if (data[i] == low && data[i + 1] == high) {
return true;
}

2
artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCreatePlugin.java
View File

@ -345,7 +345,7 @@ public class ArtemisCreatePlugin extends ArtemisAbstractPlugin {
Charset charset = StandardCharsets.UTF_8;
String content = new String(Files.readAllBytes(original), charset);
for (int i = 0; i < replacePairs.length; i += 2) {
for (int i = 0; i + 1 < replacePairs.length; i += 2) {
content = content.replaceAll(replacePairs[i], replacePairs[i + 1]);
}
Files.write(target, content.getBytes(charset));