diff options
author | tsepez <tsepez@chromium.org> | 2014-09-04 22:42:28 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-05 05:44:07 +0000 |
commit | 8f07983fb62fb48fc8298b150e4548f92a374da1 (patch) | |
tree | 846026a4dfbb29bfd195eb3ea67acdd8a7dffea4 /pdf/draw_utils.cc | |
parent | 37fac505ffd432f088abbc5056e7c72ca59ff017 (diff) | |
download | chromium_src-8f07983fb62fb48fc8298b150e4548f92a374da1.zip chromium_src-8f07983fb62fb48fc8298b150e4548f92a374da1.tar.gz chromium_src-8f07983fb62fb48fc8298b150e4548f92a374da1.tar.bz2 |
Preven OOB memory access in chrome_pdf::AlphaBlend().
Similar to bug 398384, but perform the same bounds check we introduced to
chrome_pdf::CopyImage() in the chrome_pdf::AlphaBlend() function.
Also change the return value from bool to void, since AlphaBlend() always
returns true, and no-one was checking the return value anyways.
BUG=384891
Review URL: https://codereview.chromium.org/544863002
Cr-Commit-Position: refs/heads/master@{#293454}
Diffstat (limited to 'pdf/draw_utils.cc')
-rw-r--r-- | pdf/draw_utils.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pdf/draw_utils.cc b/pdf/draw_utils.cc index 7f999f0..d38be52 100644 --- a/pdf/draw_utils.cc +++ b/pdf/draw_utils.cc @@ -57,9 +57,16 @@ inline bool ImageDataContainsRect(const pp::ImageData& image_data, pp::Rect(image_data.size()).Contains(rect); } -bool AlphaBlend(const pp::ImageData& src, const pp::Rect& src_rc, +void AlphaBlend(const pp::ImageData& src, const pp::Rect& src_rc, pp::ImageData* dest, const pp::Point& dest_origin, uint8 alpha_adjustment) { + if (src_rc.IsEmpty() || !ImageDataContainsRect(src, src_rc)) + return; + + pp::Rect dest_rc(dest_origin, src_rc.size()); + if (dest_rc.IsEmpty() || !ImageDataContainsRect(*dest, dest_rc)) + return; + const uint32_t* src_origin_pixel = src.GetAddr32(src_rc.point()); uint32_t* dest_origin_pixel = dest->GetAddr32(dest_origin); @@ -86,7 +93,6 @@ bool AlphaBlend(const pp::ImageData& src, const pp::Rect& src_rc, dest_origin_pixel = reinterpret_cast<uint32_t*>( reinterpret_cast<char*>(dest_origin_pixel) + dest->stride()); } - return true; } void GradientFill(pp::ImageData* image, const pp::Rect& rc, |