Merge branch '3.3.x'

Closes gh-42080

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/FileDataBlock.java

@@ -71,14 +71,15 @@ public int read(ByteBuffer dst, long pos) throws IOException {
 			throw new IllegalArgumentException("Position must not be negative");
 		}
 		ensureOpen(ClosedChannelException::new);
-		int remaining = (int) (this.size - pos);
+		long remaining = this.size - pos;
 		if (remaining <= 0) {
 			return -1;
 		}
 		int originalDestinationLimit = -1;
 		if (dst.remaining() > remaining) {
 			originalDestinationLimit = dst.limit();
-			dst.limit(dst.position() + remaining);
+			long updatedLimit = dst.position() + remaining;
+			dst.limit((updatedLimit > Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) updatedLimit);
 		}
 		int result = this.fileAccess.read(dst, this.offset + pos);
 		if (originalDestinationLimit != -1) {

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/ZipContent.java

@@ -636,7 +636,8 @@ private static ZipContent loadContent(Source source, Kind kind, FileDataBlock da
 		private static long getStartOfZipContent(FileDataBlock data, ZipEndOfCentralDirectoryRecord eocd,
 				Zip64EndOfCentralDirectoryRecord zip64Eocd) throws IOException {
 			long specifiedOffsetToStartOfCentralDirectory = (zip64Eocd != null)
-					? zip64Eocd.offsetToStartOfCentralDirectory() : eocd.offsetToStartOfCentralDirectory();
+					? zip64Eocd.offsetToStartOfCentralDirectory()
+					: Integer.toUnsignedLong(eocd.offsetToStartOfCentralDirectory());
 			long sizeOfCentralDirectoryAndEndRecords = getSizeOfCentralDirectoryAndEndRecords(eocd, zip64Eocd);
 			long actualOffsetToStartOfCentralDirectory = data.size() - sizeOfCentralDirectoryAndEndRecords;
 			return actualOffsetToStartOfCentralDirectory - specifiedOffsetToStartOfCentralDirectory;
@@ -650,7 +651,8 @@ private static long getSizeOfCentralDirectoryAndEndRecords(ZipEndOfCentralDirect
 				result += Zip64EndOfCentralDirectoryLocator.SIZE;
 				result += zip64Eocd.size();
 			}
-			result += (zip64Eocd != null) ? zip64Eocd.sizeOfCentralDirectory() : eocd.sizeOfCentralDirectory();
+			result += (zip64Eocd != null) ? zip64Eocd.sizeOfCentralDirectory()
+					: Integer.toUnsignedLong(eocd.sizeOfCentralDirectory());
 			return result;
 		}
 
@@ -796,18 +798,18 @@ public CloseableDataBlock openContent() throws IOException {
 		private FileDataBlock getContent() throws IOException {
 			FileDataBlock content = this.content;
 			if (content == null) {
-				int pos = this.centralRecord.offsetToLocalHeader();
+				long pos = Integer.toUnsignedLong(this.centralRecord.offsetToLocalHeader());
 				checkNotZip64Extended(pos);
 				ZipLocalFileHeaderRecord localHeader = ZipLocalFileHeaderRecord.load(ZipContent.this.data, pos);
-				int size = this.centralRecord.compressedSize();
+				long size = Integer.toUnsignedLong(this.centralRecord.compressedSize());
 				checkNotZip64Extended(size);
 				content = ZipContent.this.data.slice(pos + localHeader.size(), size);
 				this.content = content;
 			}
 			return content;
 		}
 
-		private void checkNotZip64Extended(int value) throws IOException {
+		private void checkNotZip64Extended(long value) throws IOException {
 			if (value == 0xFFFFFFFF) {
 				throw new IOException("Zip64 extended information extra fields are not supported");
 			}