From e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 9 Dec 2022 14:05:15 +0100 Subject: Fixup for patch for CVE-2022-3200 on OpenSuse 15.1 The code was using an intialization not supported by the compiler. Change-Id: I0b92b161672464025cb67196929f3da4701f3f88 Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/447781 Reviewed-by: Allan Sandfeld Jensen --- chromium/third_party/zlib/google/zip.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chromium/third_party/zlib/google/zip.cc b/chromium/third_party/zlib/google/zip.cc index 14e33cf39e9..93671117722 100644 --- a/chromium/third_party/zlib/google/zip.cc +++ b/chromium/third_party/zlib/google/zip.cc @@ -271,9 +271,11 @@ bool ZipFiles(const base::FilePath& src_dir, Paths src_relative_paths, int dest_fd) { DCHECK(base::DirectoryExists(src_dir)); - return Zip({.src_dir = src_dir, - .dest_fd = dest_fd, - .src_files = src_relative_paths}); + ZipParams params = {}; + params.src_dir = src_dir; + params.dest_fd = dest_fd; + params.src_files = src_relative_paths; + return Zip(params); } #endif // defined(OS_POSIX) || defined(OS_FUCHSIA) -- cgit v1.2.1