Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e6e9025 authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "Initialize mRowBytes and mSize with overflow check." into tm-qpr-dev am: ea44678b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20132241



Change-Id: I8c838dfd1b87a0179babdf5409d9deb6a650a91f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0df991d ea44678b

include/private/media/VideoFrame.h

+9 −3
Original line number Diff line number Diff line
@@ -42,9 +42,15 @@ public: 
        mWidth(width), mHeight(height),

        mDisplayWidth(displayWidth), mDisplayHeight(displayHeight),

        mTileWidth(tileWidth), mTileHeight(tileHeight), mDurationUs(0),

        mRotationAngle(angle), mBytesPerPixel(bpp), mRowBytes(bpp * width),

        mSize(hasData ? (bpp * width * height) : 0),

        mIccSize(iccSize), mBitDepth(bitDepth) {

        mRotationAngle(angle), mBytesPerPixel(bpp), mIccSize(iccSize),

        mBitDepth(bitDepth) {

            uint32_t multVal;

            mRowBytes = __builtin_mul_overflow(bpp, width, &multVal) ? 0 : multVal;

            mSize = __builtin_mul_overflow(multVal, height, &multVal) ? 0 : multVal;

            if (hasData && (mRowBytes == 0 || mSize == 0)) {

                ALOGE("Frame rowBytes/ size overflow %dx%d bpp %d", width, height, bpp);

                android_errorWriteLog(0x534e4554, "233006499");

            }

    }



    void init(const VideoFrame& copy, const void* iccData, size_t iccSize) {