diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 15:27:33 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 15:27:33 +0000 |
| commit | 678bc9b574109f747a0957d42501a6ee56b09c3e (patch) | |
| tree | 67c73a633d6ddb939674d7b5aebb237760ebf4c8 /webkit/plugins | |
| parent | e563a9456c981eb07c4bae91eb39b5de3c339900 (diff) | |
| download | chromium_src-678bc9b574109f747a0957d42501a6ee56b09c3e.zip chromium_src-678bc9b574109f747a0957d42501a6ee56b09c3e.tar.gz chromium_src-678bc9b574109f747a0957d42501a6ee56b09c3e.tar.bz2 | |
Properly account for all color channels when checking for overflow in image
creation.
BUG=88729
Review URL: http://codereview.chromium.org/7326021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_image_data_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppb_image_data_impl.cc b/webkit/plugins/ppapi/ppb_image_data_impl.cc index 1cc2b42..d565add 100644 --- a/webkit/plugins/ppapi/ppb_image_data_impl.cc +++ b/webkit/plugins/ppapi/ppb_image_data_impl.cc @@ -58,7 +58,7 @@ bool PPB_ImageData_Impl::Init(PP_ImageDataFormat format, return false; // Only support this one format for now. if (width <= 0 || height <= 0) return false; - if (static_cast<int64>(width) * static_cast<int64>(height) >= + if (static_cast<int64>(width) * static_cast<int64>(height) * 4 >= std::numeric_limits<int32>::max()) return false; // Prevent overflow of signed 32-bit ints. |