Skip to content

Fix wrongly computed offset in checksum #69444

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

Merged
merged 1 commit into from
Feb 23, 2021
Merged

Fix wrongly computed offset in checksum #69444

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
10 changes: 8 additions & 2 deletions ...apshots/src/main/java/org/elasticsearch/index/store/BaseSearchableSnapshotIndexInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.function.Predicate;

import static org.elasticsearch.index.store.checksum.ChecksumBlobContainerIndexInput.checksumToBytesArray;
import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsUtils.toIntBytes;

public abstract class BaseSearchableSnapshotIndexInput extends BufferedIndexInput {

Expand Down Expand Up @@ -99,16 +100,21 @@ private boolean maybeReadChecksumFromFileInfo(ByteBuffer b) throws IOException {
return false;
}
final long position = getFilePointer() + this.offset;
if (position < fileInfo.length() - CodecUtil.footerLength()) {
final long checksumPosition = fileInfo.length() - CodecUtil.footerLength();
if (position < checksumPosition) {
return false;
}
if (isClone) {
return false;
}
boolean success = false;
try {
final int checksumOffset = toIntBytes(Math.subtractExact(position, checksumPosition));
assert checksumOffset <= CodecUtil.footerLength() : checksumOffset;
assert 0 <= checksumOffset : checksumOffset;

final byte[] checksum = checksumToBytesArray(fileInfo.checksum());
b.put(checksum, CodecUtil.footerLength() - remaining, remaining);
b.put(checksum, checksumOffset, remaining);
success = true;
} catch (NumberFormatException e) {
// tests disable this optimisation by passing an invalid checksum
Expand Down