ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-08 03:24:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve error messages when locating zip file comment

Browse Source
This commit is contained in:
Jeremy Lakeman 2018-03-20 10:25:50 +10:30
parent 240f69595b
commit 3cbf60f2b7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java-api/src/org/servalproject/servaldna/rhizome/RhizomeManifest.java
View File

@ -234,7 +234,7 @@ public class RhizomeManifest {
}
public static RhizomeManifest fromZipComment(RandomAccessFile file) throws IOException, RhizomeManifestParseException {
int readLen = RhizomeManifest.TEXT_FORMAT_MAX_SIZE + 22;
int readLen = 0xFFFF + 22;
file.seek(file.length() - readLen);
byte buff[] = new byte[readLen];
file.readFully(buff);
@ -250,20 +250,22 @@ public class RhizomeManifest {
continue;
// located zip EOCD record marker 0x504b0506
offset += 20;
int manifestLen = (buff[offset++]&0xFF) | ((buff[offset++] & 0xFF) << 8);
if (manifestLen != readLen - offset)
throw new RhizomeManifestParseException("Zip Comment length ("+manifestLen+") doesn't align with end of file ("+readLen+", "+offset+")");
if (manifestLen == 0)
throw new RhizomeManifestParseException("No Zip Comment");
int testOffset = offset + 20;
int commentLen = (buff[testOffset++]&0xFF) | ((buff[testOffset++] & 0xFF) << 8);
if (commentLen != readLen - testOffset)
continue;
if (commentLen == 0)
throw new RhizomeManifestParseException("No zip comment present");
if (commentLen > RhizomeManifest.TEXT_FORMAT_MAX_SIZE)
throw new RhizomeManifestParseException("Zip comment is too long to be a valid manifest");
RhizomeManifest manifest = RhizomeManifest.fromTextFormat(buff, offset, manifestLen);
long expectedFileSize = file.length() - readLen + offset;
RhizomeManifest manifest = RhizomeManifest.fromTextFormat(buff, testOffset, commentLen);
long expectedFileSize = file.length() - readLen + testOffset;
if (manifest.filesize != expectedFileSize)
throw new RhizomeManifestParseException("Manifest filesize doesn't match zip file length");
return manifest;
}
throw new RhizomeManifestParseException("Zip EOCD record not found");
throw new RhizomeManifestParseException("Valid zip EOCD record not found");
}
private static boolean isFieldNameFirstChar(char c)