Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update zlib to 1.3.0.1-motley-82a5fec #55980

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions deps/zlib/google/zip_writer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "third_party/zlib/google/zip_writer.h"

#include <algorithm>
#include <tuple>

#include "base/files/file.h"
#include "base/logging.h"
Expand Down Expand Up @@ -193,8 +194,8 @@ bool ZipWriter::AddMixedEntries(Paths paths) {
while (!paths.empty()) {
// Work with chunks of 50 paths at most.
const size_t n = std::min<size_t>(paths.size(), 50);
const Paths relative_paths = paths.subspan(0, n);
paths = paths.subspan(n, paths.size() - n);
Paths relative_paths;
std::tie(relative_paths, paths) = paths.split_at(n);

files.clear();
if (!file_accessor_->Open(relative_paths, &files) || files.size() != n)
Expand Down Expand Up @@ -233,8 +234,8 @@ bool ZipWriter::AddFileEntries(Paths paths) {
while (!paths.empty()) {
// Work with chunks of 50 paths at most.
const size_t n = std::min<size_t>(paths.size(), 50);
const Paths relative_paths = paths.subspan(0, n);
paths = paths.subspan(n, paths.size() - n);
Paths relative_paths;
std::tie(relative_paths, paths) = paths.split_at(n);

DCHECK_EQ(relative_paths.size(), n);

Expand Down
2 changes: 1 addition & 1 deletion src/zlib_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// Refer to tools/dep_updaters/update-zlib.sh
#ifndef SRC_ZLIB_VERSION_H_
#define SRC_ZLIB_VERSION_H_
#define ZLIB_VERSION "1.3.0.1-motley-7e2e4d7"
#define ZLIB_VERSION "1.3.0.1-motley-82a5fec"
#endif // SRC_ZLIB_VERSION_H_
Loading