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

Commit b7d15a83 authored by Johan Redestig's avatar Johan Redestig Committed by android-build-merger
Browse files

Merge "Fix integer overflow in estimateMoovBoxSize" 

am: 800f9d76

* commit '800f9d76':
  Fix integer overflow in estimateMoovBoxSize

Change-Id: I7be03c79cd526237fdc48f2a643a011e38ad11f2
parents e568ba47 800f9d76

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ int64_t MPEG4Writer::estimateMoovBoxSize(int32_t bitRate) { 
    if (mMaxFileDurationLimitUs != 0) {

        if (bitRate > 0) {

            int64_t size2 =

                ((mMaxFileDurationLimitUs * bitRate * 6) / 1000 / 8000000);

                ((mMaxFileDurationLimitUs / 1000) * bitRate * 6) / 8000000;

            if (mMaxFileSizeLimitBytes != 0 && mIsFileSizeLimitExplicitlyRequested) {

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

                // we use the smaller limit of the two.