infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-27 07:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

8370986: Enhance Zip file reading

Browse Source 
Reviewed-by: rriggs, lancea, jpai
This commit is contained in:
Xueming Shen 2026-01-03 15:04:55 +00:00 committed by Jaikiran Pai
parent 9866650b64
commit 16548cd3d2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/share/classfile/classLoader.cpp
View File

@ -707,6 +707,7 @@ ClassPathEntry* ClassLoader::create_class_path_entry(JavaThread* current,
if (zip != nullptr && error_msg == nullptr) {
new_entry = new ClassPathZipEntry(zip, path);
} else {
log_info(class, path)("failed: %s, err: %s", path, error_msg);
return nullptr;
}
log_info(class, path)("opened: %s", path);

13
src/java.base/share/native/libzip/zip_util.c
View File

@ -568,7 +568,7 @@ static jlong
readCEN(jzfile *zip, jint knownTotal)
{
/* Following are unsigned 32-bit */
jlong endpos, end64pos, cenpos, cenlen, cenoff;
jlong endpos, end64pos, cenpos, cenlen, cenoff, total64;
/* Following are unsigned 16-bit */
jint total, tablelen, i, j;
unsigned char *cenbuf = NULL;
@ -604,7 +604,16 @@ readCEN(jzfile *zip, jint knownTotal)
if ((end64pos = findEND64(zip, end64buf, endpos)) != -1) {
cenlen = ZIP64_ENDSIZ(end64buf);
cenoff = ZIP64_ENDOFF(end64buf);
total = (jint)ZIP64_ENDTOT(end64buf);
total64 = ZIP64_ENDTOT(end64buf);
/* ZIP64 size, offset and total-count fields are unsigned 64-bit
* values. Sizes and offsets that do not fit in signed jlong
* (i.e., >= 2^63), or total values that do not fit in jint, are
* not supported and indicate a corrupt or invalid zip file.
*/
if (cenlen < 0 || cenoff < 0 || total64 < 0 || total64 > INT_MAX) {
ZIP_FORMAT_ERROR("Zip64 END values exceed supported size");
}
total = (jint)total64;
endpos = end64pos;
#ifdef USE_MMAP
endhdrlen = ZIP64_ENDHDR;