Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1349595 - Check GMP i420 frame size computations. r=cpearce

Browse Source 
MozReview-Commit-ID: 9HdCbOKah28
This commit is contained in:
Gerald Squelart 2017-03-31 12:21:22 +11:00
parent 4662c498be
commit b7520a7dec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/media/gmp/GMPVideoi420FrameImpl.cpp
View File

@ -5,6 +5,7 @@
#include "GMPVideoi420FrameImpl.h" #include "GMPVideoi420FrameImpl.h"
#include "mozilla/gmp/GMPTypes.h" #include "mozilla/gmp/GMPTypes.h"
#include "mozilla/CheckedInt.h"
namespace mozilla { namespace mozilla {
namespace gmp { namespace gmp {
@ -93,9 +94,11 @@ GMPVideoi420FrameImpl::CheckDimensions(int32_t aWidth, int32_t aHeight,
int32_t aStride_y, int32_t aStride_u, int32_t aStride_v) int32_t aStride_y, int32_t aStride_u, int32_t aStride_v)
{ {
int32_t half_width = (aWidth + 1) / 2; int32_t half_width = (aWidth + 1) / 2;
if (aWidth < 1 || aHeight < 1 || aStride_y < aWidth || if (aWidth < 1 || aHeight < 1 ||
aStride_u < half_width || aStride_y < aWidth || aStride_u < half_width || aStride_v < half_width ||
aStride_v < half_width) { !(CheckedInt<int32_t>(aHeight) * aStride_y
+ ((CheckedInt<int32_t>(aHeight) + 1) / 2)
* (CheckedInt<int32_t>(aStride_u) + aStride_v)).isValid()) {
return false; return false;
} }
return true; return true;