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

Commit 9b2819fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mpeg4_enc_fuzzer: Fix sizeof() bugs" am: 0eafd575 am: e8133c15 am: 5e8c23fe 

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

Change-Id: If39bde666e75b9700af1478046629bec4fb4985e
parents e9d6cf20 5e8c23fe

media/libstagefright/codecs/m4v_h263/fuzzer/mpeg4_h263_enc_fuzzer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ void Codec::encodeFrames(const uint8_t *data, size_t size) { 
    while (size > 0) {

        size_t bytesConsumed = std::min(size, inputBufferSize);

        memcpy(inputBuffer, data, bytesConsumed);

        if (bytesConsumed < sizeof(inputBuffer)) {

            memset(inputBuffer + bytesConsumed, data[0], sizeof(inputBuffer) - bytesConsumed);

        if (bytesConsumed < inputBufferSize) {

            memset(inputBuffer + bytesConsumed, data[0], inputBufferSize - bytesConsumed);

        }

        VideoEncFrameIO videoIn{}, videoOut{};

        videoIn.height = mFrameHeight;