diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 16:35:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 15:45:54 +0000 |
| commit | 32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch) | |
| tree | eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/ui/gfx/android | |
| parent | 99677208ff3b216fdfec551fbe548da5520cd6fb (diff) | |
| download | qtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz | |
BASELINE: Update Chromium to 87.0.4280.67
Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gfx/android')
| -rw-r--r-- | chromium/ui/gfx/android/java_bitmap.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromium/ui/gfx/android/java_bitmap.cc b/chromium/ui/gfx/android/java_bitmap.cc index 2a5d5883e7c..db7efd1fe69 100644 --- a/chromium/ui/gfx/android/java_bitmap.cc +++ b/chromium/ui/gfx/android/java_bitmap.cc @@ -10,6 +10,7 @@ #include "base/bits.h" #include "base/check_op.h" #include "base/notreached.h" +#include "base/numerics/safe_conversions.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/gfx_jni_headers/BitmapHelper_jni.h" @@ -86,6 +87,8 @@ ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap, JavaBitmap dst_lock(jbitmap); void* src_pixels = skbitmap->getPixels(); void* dst_pixels = dst_lock.pixels(); + CHECK_GE(base::checked_cast<size_t>(dst_lock.byte_count()), + skbitmap->computeByteSize()); memcpy(dst_pixels, src_pixels, skbitmap->computeByteSize()); return jbitmap; |