diff options
author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-03 12:43:11 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-11-17 07:09:19 +0200 |
commit | 72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch) | |
tree | 775d465f8db9fab5c4202be3d4a17f9cead61ee2 /recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |
parent | 6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff) | |
download | meta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz |
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected".
Remove patches which already merged to upstream branch.
Add depends jpeg-native and freetype-native.
Task-number: QTBUG-86641
Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index d316929c..0d73e07c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f0cb2c411e58217b694f9bdf9d34cbc56bd0d785 Mon Sep 17 00:00:00 2001 | 1 | From acc3b1b674a2568dd19418ec5b3c58330a29521a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 10 May 2020 08:16:01 -0700 | 3 | Date: Sun, 10 May 2020 08:16:01 -0700 |
4 | Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner | 4 | Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 1 file changed, 6 insertions(+), 2 deletions(-) | 25 | 1 file changed, 6 insertions(+), 2 deletions(-) |
26 | 26 | ||
27 | diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc | 27 | diff --git a/chromium/net/socket/udp_socket_posix.cc b/chromium/net/socket/udp_socket_posix.cc |
28 | index 572472a6993..504fdb5d5c6 100644 | 28 | index 7df6892d67e..030ff8896e4 100644 |
29 | --- a/chromium/net/socket/udp_socket_posix.cc | 29 | --- a/chromium/net/socket/udp_socket_posix.cc |
30 | +++ b/chromium/net/socket/udp_socket_posix.cc | 30 | +++ b/chromium/net/socket/udp_socket_posix.cc |
31 | @@ -1190,8 +1190,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( | 31 | @@ -1199,8 +1199,12 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( |
32 | for (auto& buffer : buffers) | 32 | for (auto& buffer : buffers) |
33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); | 33 | msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); |
34 | msgvec->reserve(buffers.size()); | 34 | msgvec->reserve(buffers.size()); |