Commit 8d4cb9a

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a

7 files changed

Lines changed: 73 additions & 1 deletion

File tree

‎deps/zlib/contrib/minizip/unzip.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;

‎deps/zlib/contrib/tests/utils_unittest.cc‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());

‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎

182 Bytes
Binary file not shown.

‎deps/zlib/google/test_data.filelist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip

‎deps/zlib/google/zip_reader_unittest.cc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected

‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
s->encrypted=1;
2727
}
2828
# endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
Check LFH / CD encryption flag consistency
35+
36+
unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
checks on the values in the Local File Header and Central Directory.
38+
Make it check the encryption flag as well.
39+
40+
Bug: 514461031
41+
Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
*/
50+
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
err=UNZ_ERRNO;

‎src/zlib_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 8d4cb9a
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-8b3aa8a
PR-URL: #64295
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent 8a909f4 commit 8d4cb9a
7 files changed
Lines changed: 73 additions & 1 deletion
File tree
‎deps/zlib/contrib/minizip/unzip.c‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
14391439
*/
14401440
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) !=UNZ_OK)
14411441
err=UNZ_ERRNO;
1442+
elseif ((err==UNZ_OK) && ((uFlags&1) != (s->cur_file_info.flag&1)))
1443+
err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
14421444

14431445
if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) !=UNZ_OK)
14441446
err=UNZ_ERRNO;
‎deps/zlib/contrib/tests/utils_unittest.cc‎
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,29 @@ TEST(ZlibTest, ZipUnicodePathExtra) {
14241424
EXPECT_EQ(unzClose(uzf), UNZ_OK);
14251425
}
14261426

1427+
TEST(ZlibTest, ZipEncryptionFlagMismatch) {
1428+
// Test archive created with info-zip:
1429+
// $ echo -n a > a && zip -P a -k a.zip a
1430+
// and then hex-edited to drop the encrypted flag from the central directory.
1431+
 base::FilePath zip_file = TestDataDir().AppendASCII("enc_flag_mismatch.zip");
1432+
1433+
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
1434+
ASSERT_NE(uzf, nullptr);
1435+
1436+
char name[100];
1437+
 unz_file_info file_info;
1438+
1439+
ASSERT_EQ(unzGoToFirstFile(uzf), UNZ_OK);
1440+
ASSERT_EQ(unzGetCurrentFileInfo(uzf, &file_info, name, sizeof(name),
1441+
nullptr, 0, nullptr, 0), UNZ_OK);
1442+
ASSERT_EQ(std::string(name), "A");
1443+
1444+
// minizip should reject the member due to lfh/cd encrypted flag mismatch.
1445+
EXPECT_EQ(unzOpenCurrentFilePassword(uzf, "a"), UNZ_BADZIPFILE);
1446+
1447+
EXPECT_EQ(unzClose(uzf), UNZ_OK);
1448+
}
1449+
14271450
TEST(ZlibTest, Crbug500521311) {
14281451
 base::FilePath zip_file = TestDataDir().AppendASCII("bug500521311.zip");
14291452
 unzFile uzf = unzOpen(zip_file.AsUTF8Unsafe().c_str());
‎deps/zlib/google/test/data/enc_flag_mismatch.zip‎
182 Bytes
Binary file not shown.
‎deps/zlib/google/test_data.filelist‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/data/bug500521311.zip
1919
test/data/create_symlink_test_zips.py
2020
test/data/create_test_zip.sh
2121
test/data/empty.zip
22+
test/data/enc_flag_mismatch.zip
2223
test/data/evil.zip
2324
test/data/evil_via_absolute_file_name.zip
2425
test/data/evil_via_invalid_utf8.zip
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,24 @@ TEST_F(ZipReaderTest, EncryptedFile_RightPassword) {
558558
EXPECT_TRUE(reader.ok());
559559
}
560560

561+
// An entry whose local file header has the "encrypted" general-purpose flag
562+
// bit set while the central directory does not should be rejected.
563+
TEST_F(ZipReaderTest, MismatchedEncryptionFlag) {
564+
 ZipReader reader;
565+
ASSERT_TRUE(reader.Open(data_dir_.AppendASCII("enc_flag_mismatch.zip")));
566+
567+
const ZipReader::Entry* entry = reader.Next();
568+
ASSERT_TRUE(entry);
569+
EXPECT_EQ(base::FilePath::FromASCII("A"), entry->path);
570+
EXPECT_FALSE(entry->is_directory);
571+
 std::string contents = "dummy";
572+
EXPECT_FALSE(reader.ExtractCurrentEntryToString(&contents));
573+
EXPECT_EQ("", contents);
574+
575+
EXPECT_FALSE(reader.Next());
576+
EXPECT_TRUE(reader.ok());
577+
}
578+
561579
// Verifies that the ZipReader class can extract a file from a zip archive
562580
// stored in memory. This test opens a zip archive in a std::string object,
563581
// extracts its content, and verifies the content is the same as the expected
‎deps/zlib/patches/0015-minizip-unzip-enable-decryption.patch‎
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,31 @@ index 82275d6c1775d..c8a01b23efd42 100644
2626
 s->encrypted=1;
2727
 }
2828
 # endif
29+
30+
commit 874ed6b46a4f75407829e510db77cc673a4c86e7
31+
Author: Hans Wennborg <hans@chromium.org>
32+
Date: Mon Jun 15 11:33:46 2026 +0200
33+
34+
 Check LFH / CD encryption flag consistency
35+
36+
 unz64local_CheckCurrentFileCoherencyHeader performs various consistency
37+
 checks on the values in the Local File Header and Central Directory.
38+
 Make it check the encryption flag as well.
39+
40+
 Bug: 514461031
41+
 Change-Id: Ifaf8620c6e0c345118712bce6e1206bbb83b3a2d
42+
 Reviewed-on: https://chromium-review.googlesource.com/7942389
43+
44+
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
45+
index 0264f7ac570f7..4eb0de302cfdf 100644
46+
--- a/third_party/zlib/contrib/minizip/unzip.c
47+
+++ b/third_party/zlib/contrib/minizip/unzip.c
48+
@@ -1439,6 +1439,8 @@ local int unz64local_CheckCurrentFileCoherencyHeader(unz64_s* s, uInt* piSizeVar
49+
 */
50+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
51+
 err=UNZ_ERRNO;
52+
+ else if ((err==UNZ_OK) && ((uFlags & 1) != (s->cur_file_info.flag & 1)))
53+
+ err=UNZ_BADZIPFILE; /* LFH/CD encryption flag mismatch */
54+
55+
 if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
56+
 err=UNZ_ERRNO;
‎src/zlib_version.h‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Refer to tools/dep_updaters/update-zlib.sh
33
#ifndefSRC_ZLIB_VERSION_H_
44
#defineSRC_ZLIB_VERSION_H_
5-
#defineZLIB_VERSION "1.3.2.1-motley-3246f1b"
5+
#defineZLIB_VERSION "1.3.2.1-motley-8b3aa8a"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)