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

Commit 8e2cb8f4 authored by Venkatarama Avadhani's avatar Venkatarama Avadhani
Browse files

Fix Integer overflow in estimateCuesSize 

With a 200GB SD Card the Camera reported an expected max file duration
of 89158000000 us. This number will cause an overflow in estimating the
size of the file. Fix this by calculating the size on a long double and
then assigning a limited value to size.

Bug: 352217637
Test: atest StagefrightRecorderTest
Change-Id: Ibb17ece0fe6ea80abfeaa12a054db7cf40fff90e
parent 7e3b7e2e

media/libstagefright/webm/WebmWriter.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,7 @@ uint64_t WebmWriter::estimateCuesSize(int32_t bitRate) { 
    // Max file duration limit is set

    // Max file duration limit is set

    if (mMaxFileDurationLimitUs != 0) {

    if (mMaxFileDurationLimitUs != 0) {

        if (bitRate > 0) {

        if (bitRate > 0) {

            int64_t size2 = ((mMaxFileDurationLimitUs * bitRate * 6) / 1000 / 8000000);

            int64_t size2 = ((mMaxFileDurationLimitUs / 1000) * bitRate * 6) / 8000000;

            if (mMaxFileSizeLimitBytes != 0 && mIsFileSizeLimitExplicitlyRequested) {

            if (mMaxFileSizeLimitBytes != 0 && mIsFileSizeLimitExplicitlyRequested) {

                // When both file size and duration limits are set,

                // When both file size and duration limits are set,

                // we use the smaller limit of the two.

                // we use the smaller limit of the two.