hytale/hytale-server
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src: update IndexedStorageFile

Browse Source
This commit is contained in:
luk
2026-01-26 15:50:59 +00:00
parent fc28afcdb9
commit 4554327e74
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/hypixel/hytale/storage/IndexedStorageFile.java
View File

@@ -426,7 +426,7 @@ public class IndexedStorageFile implements Closeable {
ByteBuffer blobHeaderBuffer; ByteBuffer blobHeaderBuffer;
try { try {
int firstSegmentIndex = this.mappedBlobIndexes.getInt(indexPos); int firstSegmentIndex = this.mappedBlobIndexes.getInt(indexPos);
if (firstSegmentIndex != 0) { if (firstSegmentIndex > 0) { // Changed from != 0 to > 0 to reject negative indices
blobHeaderBuffer = this.readBlobHeader(firstSegmentIndex); blobHeaderBuffer = this.readBlobHeader(firstSegmentIndex);
srcLength = blobHeaderBuffer.getInt(SRC_LENGTH_OFFSET); srcLength = blobHeaderBuffer.getInt(SRC_LENGTH_OFFSET);
int compressedLength = blobHeaderBuffer.getInt(COMPRESSED_LENGTH_OFFSET); int compressedLength = blobHeaderBuffer.getInt(COMPRESSED_LENGTH_OFFSET);
@@ -458,7 +458,7 @@ public class IndexedStorageFile implements Closeable {
int srcLength; int srcLength;
try { try {
int firstSegmentIndex = this.mappedBlobIndexes.getInt(indexPos); int firstSegmentIndex = this.mappedBlobIndexes.getInt(indexPos);
if (firstSegmentIndex == 0) { if (firstSegmentIndex <= 0) { // Changed from == 0 to <= 0 to reject negative indices
return; return;
} }
@@ -509,8 +509,16 @@ public class IndexedStorageFile implements Closeable {
} }
} }
private static final int MAX_COMPRESSED_LENGTH = 256 * 1024 * 1024; // 256MB max to prevent OOM
@Nonnull @Nonnull
protected ByteBuffer readSegments(int firstSegmentIndex, int compressedLength) throws IOException { protected ByteBuffer readSegments(int firstSegmentIndex, int compressedLength) throws IOException {
if (compressedLength <= 0 || compressedLength > MAX_COMPRESSED_LENGTH) {
throw new IOException("Invalid compressed length: " + compressedLength);
}
if (firstSegmentIndex <= 0) {
throw new IOException("Invalid segment index: " + firstSegmentIndex);
}
ByteBuffer buffer = allocateDirect(compressedLength); ByteBuffer buffer = allocateDirect(compressedLength);
long segmentPosition = this.segmentPosition(firstSegmentIndex); long segmentPosition = this.segmentPosition(firstSegmentIndex);
if (this.fileChannel.read(buffer, segmentPosition + BLOB_HEADER_LENGTH) != compressedLength) { if (this.fileChannel.read(buffer, segmentPosition + BLOB_HEADER_LENGTH) != compressedLength) {