Commit 5109092

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092

4 files changed

Lines changed: 165 additions & 4 deletions

File tree

‎deps/zlib/google/zip_reader.cc‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
configured_encoding,
325+
base::OnStringConversionError::SUBSTITUTE,
326+
&physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
}
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
entry_.physical_path = entry_.path;
334+
physical_path_is_directory = entry_.is_directory;
335+
physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
entry_.path_in_original_encoding = info.utf8_filename;
340+
entry_path_encoding = base::kCodepageUTF8;
314341
}
315342

316343
// Convert path from original encoding to Unicode.
317344
std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
entry_path_encoding,
320347
base::OnStringConversionError::SUBSTITUTE,
321348
&path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
}
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
} else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
entry_.physical_path = entry_.path;
366+
}
367+
329368
entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.

‎deps/zlib/google/zip_reader.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.

‎deps/zlib/google/zip_reader_unittest.cc‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
std::string test_string(test_data, sizeof(test_data));
1018+
ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
std::string test_string(test_data, sizeof(test_data));
1077+
ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
std::string test_string(test_data, sizeof(test_data));
1107+
ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {

‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
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 5109092
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update zlib to 1.3.2.1-motley-42c2f19
PR-URL: #64744
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 72ee03b commit 5109092
4 files changed
Lines changed: 165 additions & 4 deletions
File tree
‎deps/zlib/google/zip_reader.cc‎
Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include"base/files/file.h"
1717
#include"base/files/file_util.h"
1818
#include"base/functional/bind.h"
19+
#include"base/i18n/i18n_constants.h"
1920
#include"base/i18n/icu_string_conversions.h"
2021
#include"base/logging.h"
2122
#include"base/numerics/safe_conversions.h"
@@ -307,25 +308,63 @@ bool ZipReader::OpenEntry() {
307308
DCHECK(path_in_zip[info.size_filename] == '\0');
308309
 entry_.path_in_original_encoding = path_in_zip.data();
309310

311+
constchar* const configured_encoding =
312+
 encoding_.empty() ? base::kCodepageUTF8 : encoding_.c_str();
313+
constchar* entry_path_encoding = configured_encoding;
314+
bool physical_path_is_directory = false;
315+
bool physical_path_is_unsafe = false;
316+
317+
// If an Info-ZIP Unicode Path Extra Field is present, the physical Central
318+
// Directory path is about to be overridden. Decode and normalize it now into
319+
// `entry_.physical_path` so consumers (e.g. Safe Browsing) can still see the
320+
// name that other tools (e.g. Windows Explorer) would use for extraction.
310321
if (info.size_utf8_filename > 0) {
322+
 std::u16string physical_path_in_utf16;
323+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
324+
 configured_encoding,
325+
 base::OnStringConversionError::SUBSTITUTE,
326+
 &physical_path_in_utf16)) {
327+
LOG(ERROR) << "Cannot convert path from encoding " << configured_encoding;
328+
returnfalse;
329+
 }
330+
// Normalize() stores the normalized result in entry_.path; copy it before
331+
// applying the Unicode Path Extra Field below.
332+
Normalize(physical_path_in_utf16);
333+
 entry_.physical_path = entry_.path;
334+
 physical_path_is_directory = entry_.is_directory;
335+
 physical_path_is_unsafe = entry_.is_unsafe;
336+
311337
// Use the Info-ZIP Unicode Path Extra Field if present.
312338
DCHECK(info.utf8_filename[info.size_utf8_filename] == '\0');
313339
 entry_.path_in_original_encoding = info.utf8_filename;
340+
 entry_path_encoding = base::kCodepageUTF8;
314341
 }
315342

316343
// Convert path from original encoding to Unicode.
317344
 std::u16string path_in_utf16;
318-
constchar* const encoding = encoding_.empty() ? "UTF-8" : encoding_.c_str();
319-
if (!base::CodepageToUTF16(entry_.path_in_original_encoding, encoding,
345+
if (!base::CodepageToUTF16(entry_.path_in_original_encoding,
346+
 entry_path_encoding,
320347
 base::OnStringConversionError::SUBSTITUTE,
321348
 &path_in_utf16)) {
322-
LOG(ERROR) << "Cannot convert path from encoding " << encoding;
349+
LOG(ERROR) << "Cannot convert path from encoding " << entry_path_encoding;
323350
returnfalse;
324351
 }
325352

326353
// Normalize path.
327354
Normalize(path_in_utf16);
328355

356+
if (info.size_utf8_filename > 0) {
357+
// Treat an entry as a directory only if both names are directories;
358+
// otherwise callers that analyze file entries should inspect it as a file.
359+
 entry_.is_directory = entry_.is_directory && physical_path_is_directory;
360+
// Treat an entry as unsafe if either name is unsafe.
361+
 entry_.is_unsafe = entry_.is_unsafe || physical_path_is_unsafe;
362+
 } else {
363+
// In the common case (no Unicode Path Extra Field) the physical path
364+
// matches the effective path.
365+
 entry_.physical_path = entry_.path;
366+
 }
367+
329368
 entry_.original_size = info.uncompressed_size;
330369

331370
// The file content of this entry is encrypted if flag bit 0 is set.
‎deps/zlib/google/zip_reader.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ class ZipReader {
130130
// ./a -> DOT/a
131131
 base::FilePath path;
132132

133+
// Physical path from the ZIP Central Directory, before applying the
134+
// Info-ZIP Unicode Path Extra Field. This is converted and normalized in
135+
// the same way as `path`.
136+
 base::FilePath physical_path;
137+
133138
// Size of the original uncompressed file, or 0 if the entry is a directory.
134139
// This value should not be trusted, because it is stored as metadata in the
135140
// ZIP archive and can be different from the real uncompressed size.
‎deps/zlib/google/zip_reader_unittest.cc‎
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,123 @@ TEST_F(ZipReaderTest, WrongFilenameLength) {
998998
 reader.Next();
999999
}
10001000

1001+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesPhysicalPath) {
1002+
staticconstchar test_data[] = {
1003+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1004+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1005+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1006+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1007+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1008+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1009+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1010+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1011+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1012+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x64, 0x6f, 0x77, 0x6e,
1013+
0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1014+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1015+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1016+
1017+
 std::string test_string(test_data, sizeof(test_data));
1018+
 ZipReader reader;
1019+
ASSERT_TRUE(reader.OpenFromString(test_string));
1020+
const ZipReader::Entry* entry = reader.Next();
1021+
ASSERT_TRUE(entry);
1022+
// The Unicode Path Extra Field overrides the Central Directory filename,
1023+
// but the original physical path is preserved separately. `is_unsafe` tracks
1024+
// path traversal safety, not whether the filename looks executable.
1025+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1026+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1027+
 entry->physical_path);
1028+
EXPECT_FALSE(entry->is_directory);
1029+
EXPECT_FALSE(entry->is_unsafe);
1030+
}
1031+
1032+
TEST_F(ZipReaderTest, UnicodePathExtraFieldUsesUtf8WithConfiguredEncoding) {
1033+
staticconstexpruint8_t test_data[] = {
1034+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1035+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1036+
0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1037+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64, 0x61,
1038+
0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00, 0x00,
1039+
0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00,
1040+
0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x15, 0x00, 0x00, 0x00,
1041+
0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00, 0x00,
1042+
0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x75,
1043+
0x70, 0x11, 0x00, 0x01, 0xed, 0x4b, 0x16, 0x3c, 0x72, 0xc3, 0xa9, 0x73,
1044+
0x75, 0x6d, 0xc3, 0xa9, 0x2e, 0x74, 0x78, 0x74, 0x50, 0x4b, 0x05, 0x06,
1045+
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00, 0x00,
1046+
0x32, 0x00, 0x00, 0x00, 0x00, 0x00};
1047+
1048+
 std::string test_string(reinterpret_cast<constchar*>(test_data),
1049+
sizeof(test_data));
1050+
 ZipReader reader;
1051+
ASSERT_TRUE(reader.OpenFromString(test_string));
1052+
 reader.SetEncoding("windows-1252");
1053+
const ZipReader::Entry* entry = reader.Next();
1054+
ASSERT_TRUE(entry);
1055+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("résumé.txt"), entry->path);
1056+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"),
1057+
 entry->physical_path);
1058+
}
1059+
1060+
TEST_F(ZipReaderTest, UnicodePathExtraFieldFileIfEitherPathIsFile) {
1061+
staticconstchar test_data[] = {
1062+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1063+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1064+
0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1065+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x54, 0x65, 0x73, 0x74, 0x20, 0x64,
1066+
0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a, 0x03, 0x00,
1067+
0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09,
1068+
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x14, 0x00, 0x00,
1069+
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00, 0x00, 0x00,
1070+
0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65,
1071+
0x2f, 0x75, 0x70, 0x10, 0x00, 0x01, 0x5a, 0x5a, 0x54, 0xa7, 0x6d, 0x61,
1072+
0x6c, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x50, 0x4b, 0x05,
1073+
0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x4e, 0x00, 0x00,
1074+
0x00, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00};
1075+
1076+
 std::string test_string(test_data, sizeof(test_data));
1077+
 ZipReader reader;
1078+
ASSERT_TRUE(reader.OpenFromString(test_string));
1079+
const ZipReader::Entry* entry = reader.Next();
1080+
ASSERT_TRUE(entry);
1081+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe"), entry->path);
1082+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/"),
1083+
 entry->physical_path);
1084+
EXPECT_FALSE(entry->is_directory);
1085+
EXPECT_FALSE(entry->is_unsafe);
1086+
}
1087+
1088+
TEST_F(ZipReaderTest, UnicodePathExtraFieldPreservesUnsafePhysicalPath) {
1089+
staticconstchar test_data[] = {
1090+
0x50, 0x4b, 0x03, 0x04, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71,
1091+
0x91, 0x4e, 0x11, 0x2c, 0xf9, 0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
1092+
0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c,
1093+
0x77, 0x61, 0x72, 0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f,
1094+
0x2e, 0x2e, 0x54, 0x65, 0x73, 0x74,
1095+
0x20, 0x64, 0x61, 0x74, 0x61, 0x50, 0x4b, 0x01, 0x02, 0x3f, 0x03, 0x0a,
1096+
0x03, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x71, 0x91, 0x4e, 0x11, 0x2c, 0xf9,
1097+
0x51, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x15,
1098+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc9, 0x81, 0x00,
1099+
0x00, 0x00, 0x00, 0x6d, 0x61, 0x6c, 0x77, 0x61, 0x72,
1100+
0x65, 0x2e, 0x65, 0x78, 0x65, 0x2f, 0x2e, 0x2e, 0x75,
1101+
0x70, 0x11, 0x00, 0x01, 0x7c, 0xbc, 0xe2, 0x5d, 0x64,
1102+
0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2e, 0x74,
1103+
0x78, 0x74, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
1104+
0x01, 0x00, 0x51, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00};
1105+
1106+
 std::string test_string(test_data, sizeof(test_data));
1107+
 ZipReader reader;
1108+
ASSERT_TRUE(reader.OpenFromString(test_string));
1109+
const ZipReader::Entry* entry = reader.Next();
1110+
ASSERT_TRUE(entry);
1111+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("download.txt"), entry->path);
1112+
EXPECT_EQ(base::FilePath::FromUTF8Unsafe("malware.exe/UP"),
1113+
 entry->physical_path);
1114+
EXPECT_FALSE(entry->is_directory);
1115+
EXPECT_TRUE(entry->is_unsafe);
1116+
}
1117+
10011118
classFileWriterDelegateTest : public ::testing::Test {
10021119
protected:
10031120
voidSetUp() override {
‎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-8b3aa8a"
5+
#defineZLIB_VERSION "1.3.2.1-motley-42c2f19"
66
#endif// SRC_ZLIB_VERSION_H_
0 commit comments
Comments
 (0)