From 8645f21fc8180bf5ae04b3d25fa9349bbfd891c2 Mon Sep 17 00:00:00 2001 From: Pedro Pontes Date: Tue, 3 May 2022 12:21:29 +0200 Subject: [PATCH 1/2] chore: cherry-pick 5be8e065f43e from chromium --- patches/chromium/.patches | 1 + .../chromium/cherry-pick-5be8e065f43e.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 patches/chromium/cherry-pick-5be8e065f43e.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index e6c67e24ebad6..c7ea4e89b7ef4 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -175,3 +175,4 @@ skia_renderer_-_don_t_explicitly_clip_scissor_for_large_transforms.patch skia_renderer_use_rectf_intersect_in_applyscissor.patch cherry-pick-1a31e2110440.patch m100_change_ownership_of_blobbytesprovider.patch +cherry-pick-5be8e065f43e.patch diff --git a/patches/chromium/cherry-pick-5be8e065f43e.patch b/patches/chromium/cherry-pick-5be8e065f43e.patch new file mode 100644 index 0000000000000..1f356c6d7e48d --- /dev/null +++ b/patches/chromium/cherry-pick-5be8e065f43e.patch @@ -0,0 +1,37 @@ +From 5be8e065f43e219d4ab71cefecdbbfd3e75ff426 Mon Sep 17 00:00:00 2001 +From: Gregg Tavares +Date: Fri, 29 Apr 2022 15:23:33 +0000 +Subject: [PATCH] [M96-LTS] Check for error when calling ComputeImageSizeInBytes + +(cherry picked from commit f3244fe50ba6c64ab6a75f1370d8dd983927fae6) + +Bug: chromium:1304987 +Change-Id: I8311231156fca3200ce74d79db59d910a1a0e33a +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3556686 +Commit-Queue: Gregg Tavares +Cr-Original-Commit-Position: refs/heads/main@{#986304} +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3597078 +Owners-Override: Victor-Gabriel Savu +Reviewed-by: Victor-Gabriel Savu +Commit-Queue: Roger Felipe Zanoni da Silva +Cr-Commit-Position: refs/branch-heads/4664@{#1609} +Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512} +--- + +diff --git a/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc b/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc +index 16babfa9..767b477d 100644 +--- a/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc ++++ b/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc +@@ -3996,8 +3996,10 @@ + data.resize(width * height * bytes_per_pixel); + + unsigned image_size_in_bytes, skip_size_in_bytes; +- ComputeImageSizeInBytes(format, type, width, height, 1, unpack_params, +- &image_size_in_bytes, nullptr, &skip_size_in_bytes); ++ if (ComputeImageSizeInBytes(format, type, width, height, 1, unpack_params, ++ &image_size_in_bytes, nullptr, ++ &skip_size_in_bytes) != GL_NO_ERROR) ++ return false; + const uint8_t* src_data = static_cast(pixels); + if (skip_size_in_bytes) { + src_data += skip_size_in_bytes; From 960e702c9cbb6018cbe89667ff3627a4c94ee733 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Tue, 3 May 2022 10:32:00 +0000 Subject: [PATCH 2/2] chore: update patches --- patches/chromium/cherry-pick-5be8e065f43e.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/patches/chromium/cherry-pick-5be8e065f43e.patch b/patches/chromium/cherry-pick-5be8e065f43e.patch index 1f356c6d7e48d..d019df82af33d 100644 --- a/patches/chromium/cherry-pick-5be8e065f43e.patch +++ b/patches/chromium/cherry-pick-5be8e065f43e.patch @@ -1,7 +1,7 @@ -From 5be8e065f43e219d4ab71cefecdbbfd3e75ff426 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gregg Tavares Date: Fri, 29 Apr 2022 15:23:33 +0000 -Subject: [PATCH] [M96-LTS] Check for error when calling ComputeImageSizeInBytes +Subject: Check for error when calling ComputeImageSizeInBytes (cherry picked from commit f3244fe50ba6c64ab6a75f1370d8dd983927fae6) @@ -16,13 +16,12 @@ Reviewed-by: Victor-Gabriel Savu Commit-Queue: Roger Felipe Zanoni da Silva Cr-Commit-Position: refs/branch-heads/4664@{#1609} Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512} ---- diff --git a/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc b/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc -index 16babfa9..767b477d 100644 +index 16babfa9bcf98d640bc32be99fc8641e3f459a4b..767b477d50d79b2bca8dcb09d21d3c474d825fca 100644 --- a/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc +++ b/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conversion.cc -@@ -3996,8 +3996,10 @@ +@@ -3996,8 +3996,10 @@ bool WebGLImageConversion::ExtractTextureData( data.resize(width * height * bytes_per_pixel); unsigned image_size_in_bytes, skip_size_in_bytes;