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

Commit 08cb8520 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Fix potential overflow am: d0090759

am: f5d9360b

Change-Id: Ia936e59f80f6a24e449d0aee453956e3be29033a
parents 3d1df4f4 f5d9360b
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@
#include "h264bsd_util.h"
#include "basetype.h"

#include <log/log.h>
/*------------------------------------------------------------------------------
    2. External compiler flags
--------------------------------------------------------------------------------
@@ -998,6 +999,13 @@ u32 h264bsdInitDpb(
    ASSERT(maxFrameNum);
    ASSERT(dpbSize);

    // see comment in loop below about size calculation
    if (picSizeInMbs > (UINT32_MAX - 32 - 15) / 384) {
        ALOGE("b/28533562");
        android_errorWriteLog(0x534e4554, "28533562");
        return(MEMORY_ALLOCATION_ERROR);
    }

    dpb->maxLongTermFrameIdx = NO_LONG_TERM_FRAME_INDICES;
    dpb->maxRefFrames        = MAX(maxRefFrames, 1);
    if (noReordering)