Skip to content

Fix null checks for engine unwrap buffer lists. #1403

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix null checks for engine unwrap buffer lists. #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions common/src/main/java/org/conscrypt/ConscryptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,8 +753,8 @@ SSLEngineResult unwrap(final ByteBuffer[] srcs, int srcsOffset, final int srcsLe
checkPositionIndexes(dstsOffset, dstsOffset + dstsLength, dsts.length);

// Determine the output capacity.
final int dstLength = calcDstsLength(dsts, dstsOffset, dstsLength);
final int endOffset = dstsOffset + dstsLength;
final int dstsEndOffset = dstsOffset + dstsLength;
final long dstLength = calcDstsLength(dsts, dstsOffset, dstsEndOffset);

final int srcsEndOffset = srcsOffset + srcsLength;
final long srcLength = calcSrcsLength(srcs, srcsOffset, srcsEndOffset);
Expand Down Expand Up @@ -863,7 +863,7 @@ SSLEngineResult unwrap(final ByteBuffer[] srcs, int srcsOffset, final int srcsLe
try {
if (dstLength > 0) {
// Write decrypted data to dsts buffers
for (int idx = dstsOffset; idx < endOffset; ++idx) {
for (int idx = dstsOffset; idx < dstsEndOffset; ++idx) {
ByteBuffer dst = dsts[idx];
if (!dst.hasRemaining()) {
continue;
Expand Down Expand Up @@ -933,17 +933,15 @@ SSLEngineResult unwrap(final ByteBuffer[] srcs, int srcsOffset, final int srcsLe
}
}

private static int calcDstsLength(ByteBuffer[] dsts, int dstsOffset, int dstsLength) {
int capacity = 0;
for (int i = 0; i < dsts.length; i++) {
private static long calcDstsLength(ByteBuffer[] dsts, int dstsOffset, int dstsEndOffset) {
long capacity = 0;
for (int i = dstsOffset; i < dstsEndOffset; i++) {
ByteBuffer dst = dsts[i];
checkArgument(dst != null, "dsts[%d] is null", i);
if (dst.isReadOnly()) {
throw new ReadOnlyBufferException();
}
if (i >= dstsOffset && i < dstsOffset + dstsLength) {
capacity += dst.remaining();
}
capacity += dst.remaining();
}
return capacity;
}
Expand All @@ -952,9 +950,7 @@ private static long calcSrcsLength(ByteBuffer[] srcs, int srcsOffset, int srcsEn
long len = 0;
for (int i = srcsOffset; i < srcsEndOffset; i++) {
ByteBuffer src = srcs[i];
if (src == null) {
throw new IllegalArgumentException("srcs[" + i + "] is null");
}
checkArgument(src != null, "srcs[%d] is null", i);
len += src.remaining();
}
return len;
Expand Down
Loading