Skip to content

Commit e4239f6

Browse files
deps: update zlib to 1.2.13.1-motley-2359864
1 parent e9ff810 commit e4239f6

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

deps/zlib/google/zip_internal.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,13 @@ zip_fileinfo TimeToZipFileInfo(const base::Time& file_time) {
260260
// It assumes that dates below 1980 are in the double digit format.
261261
// Hence the fail safe option is to leave the date unset. Some programs
262262
// might show the unset date as 1980-0-0 which is invalid.
263-
zip_info.tmz_date.tm_year = file_time_parts.year;
264-
zip_info.tmz_date.tm_mon = file_time_parts.month - 1;
265-
zip_info.tmz_date.tm_mday = file_time_parts.day_of_month;
266-
zip_info.tmz_date.tm_hour = file_time_parts.hour;
267-
zip_info.tmz_date.tm_min = file_time_parts.minute;
268-
zip_info.tmz_date.tm_sec = file_time_parts.second;
263+
zip_info.tmz_date = {
264+
.tm_sec = static_cast<uInt>(file_time_parts.second),
265+
.tm_min = static_cast<uInt>(file_time_parts.minute),
266+
.tm_hour = static_cast<uInt>(file_time_parts.hour),
267+
.tm_mday = static_cast<uInt>(file_time_parts.day_of_month),
268+
.tm_mon = static_cast<uInt>(file_time_parts.month - 1),
269+
.tm_year = static_cast<uInt>(file_time_parts.year)};
269270
}
270271

271272
return zip_info;

deps/zlib/google/zip_reader.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@ bool ZipReader::OpenEntry() {
246246

247247
// Construct the last modified time. The timezone info is not present in ZIP
248248
// archives, so we construct the time as UTC.
249-
base::Time::Exploded exploded_time = {};
250-
exploded_time.year = info.tmu_date.tm_year;
251-
exploded_time.month = info.tmu_date.tm_mon + 1; // 0-based vs 1-based
252-
exploded_time.day_of_month = info.tmu_date.tm_mday;
253-
exploded_time.hour = info.tmu_date.tm_hour;
254-
exploded_time.minute = info.tmu_date.tm_min;
255-
exploded_time.second = info.tmu_date.tm_sec;
256-
exploded_time.millisecond = 0;
249+
const base::Time::Exploded exploded_time = {
250+
.year = static_cast<int>(info.tmu_date.tm_year),
251+
.month =
252+
static_cast<int>(info.tmu_date.tm_mon + 1), // 0-based vs 1-based
253+
.day_of_month = static_cast<int>(info.tmu_date.tm_mday),
254+
.hour = static_cast<int>(info.tmu_date.tm_hour),
255+
.minute = static_cast<int>(info.tmu_date.tm_min),
256+
.second = static_cast<int>(info.tmu_date.tm_sec)};
257257

258258
if (!base::Time::FromUTCExploded(exploded_time, &entry_.last_modified))
259259
entry_.last_modified = base::Time::UnixEpoch();

doc/contributing/maintaining/maintaining-dependencies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This a list of all the dependencies:
3131
* [undici 5.23.0][]
3232
* [uvwasi 0.0.16][]
3333
* [V8 11.3.244.8][]
34-
* [zlib 1.2.13.1-motley-f5fd0ad][]
34+
* [zlib 1.2.13.1-motley-2359864][]
3535

3636
Any code which meets one or more of these conditions should
3737
be managed as a dependency:
@@ -311,7 +311,7 @@ See [maintaining-web-assembly][] for more informations.
311311
high-performance JavaScript and WebAssembly engine, written in C++.
312312
See [maintaining-V8][] for more informations.
313313

314-
### zlib 1.2.13.1-motley-f5fd0ad
314+
### zlib 1.2.13.1-motley-2359864
315315

316316
The [zlib](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib)
317317
dependency lossless data-compression library,
@@ -349,4 +349,4 @@ performance improvements not currently available in standard zlib.
349349
[update-openssl-action]: ../../../.github/workflows/update-openssl.yml
350350
[uvwasi 0.0.16]: #uvwasi-0016
351351
[v8 11.3.244.8]: #v8-1132448
352-
[zlib 1.2.13.1-motley-f5fd0ad]: #zlib-12131-motley-f5fd0ad
352+
[zlib 1.2.13.1-motley-2359864]: #zlib-12131-motley-2359864

0 commit comments

Comments
 (0)