Skip to content

Arrays::getLength: include 'from' in exception message #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Arrays::getLength: include 'from' in exception message #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
713a413
Arrays::getLength: include 'from' in exception message
Artox Oct 7, 2017
6e95e02
Arrays::copyOfRange: throw exception for negative range
Artox Oct 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions core/src/main/java/org/bouncycastle/util/Arrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,11 @@ public static BigInteger[] copyOf(BigInteger[] data, int newLength)
public static byte[] copyOfRange(byte[] data, int from, int to)
{
int newLength = getLength(from, to);
if(newLength < 0) {
StringBuffer sb = new StringBuffer();
sb.append(from).append(" > ").append(to);
throw new IllegalArgumentException(sb.toString());
}

byte[] tmp = new byte[newLength];

Expand Down Expand Up @@ -895,8 +900,8 @@ private static int getLength(int from, int to)
int newLength = to - from;
if (newLength < 0)
{
StringBuffer sb = new StringBuffer(from);
sb.append(" > ").append(to);
StringBuffer sb = new StringBuffer();
sb.append(from).append(" > ").append(to);
throw new IllegalArgumentException(sb.toString());
}
return newLength;
Expand Down