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

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

Merge "Fix potential memory leaks" am: fee26ff7 

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



Change-Id: I0d721a2fac0985bbecdda7eaf8aa992d208dc3ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9021a781 fee26ff7

media/libstagefright/tests/HEVC/HEVCUtilsUnitTest.cpp

+8 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <utils/Log.h>



#include <fstream>

#include <memory>



#include <media/stagefright/foundation/ABitReader.h>

#include <HevcUtils.h>
@@ -88,10 +89,10 @@ TEST_P(HEVCUtilsUnitTest, NALUnitTest) { 
        stringLine >> type >> chunkLength;

        ASSERT_GT(chunkLength, 0) << "Length of data chunk must be greater than 0";



        char *data = (char *)malloc(chunkLength);

        std::unique_ptr<char[]> data(new char[chunkLength]);

        ASSERT_NE(data, nullptr) << "Failed to allocate data buffer of size: " << chunkLength;



        mMediaFileStream.read(data, chunkLength);

        mMediaFileStream.read(data.get(), chunkLength);

        ASSERT_EQ(mMediaFileStream.gcount(), chunkLength)

                << "Failed to read complete file, bytes read: " << mMediaFileStream.gcount();
@@ -105,7 +106,7 @@ TEST_P(HEVCUtilsUnitTest, NALUnitTest) { 
        offset += 3;

        ASSERT_LE(offset, chunkLength) << "NAL unit offset must not exceed the chunk length";



        uint8_t *nalUnit = (uint8_t *)(data + offset);

        uint8_t *nalUnit = (uint8_t *)(data.get() + offset);

        size_t nalUnitLength = chunkLength - offset;



        // Add NAL units only if they're of type: VPS/SPS/PPS/SEI
@@ -118,20 +119,18 @@ TEST_P(HEVCUtilsUnitTest, NALUnitTest) { 
            size_t sizeNalUnit = hevcParams.getSize(index);

            ASSERT_EQ(sizeNalUnit, nalUnitLength) << "Invalid size returned for NAL: " << type;



            uint8_t *destination = (uint8_t *)malloc(nalUnitLength);

            std::unique_ptr<uint8_t[]> destination(new uint8_t[nalUnitLength]);

            ASSERT_NE(destination, nullptr)

                    << "Failed to allocate buffer of size: " << nalUnitLength;



            bool status = hevcParams.write(index, destination, nalUnitLength);

            bool status = hevcParams.write(index, destination.get(), nalUnitLength);

            ASSERT_TRUE(status) << "Unable to write NAL Unit data";



            free(destination);

            index++;

        } else {

            err = hevcParams.addNalUnit(nalUnit, nalUnitLength);

            ASSERT_NE(err, (status_t)OK) << "Invalid NAL Unit added, type: " << type;

        }

        free(data);

    }



    size_t numNalUnits = hevcParams.getNumNalUnitsOfType(kVPSCode);
@@ -166,10 +165,10 @@ TEST_P(HEVCUtilsUnitTest, NALUnitTest) { 
            << "Expected NAL type: 34(PPS), found: " << typeNalUnit;



    size_t hvccBoxSize = kHvccBoxMaxSize;

    uint8_t *hvcc = (uint8_t *)malloc(kHvccBoxMaxSize);

    std::unique_ptr<uint8_t[]> hvcc(new uint8_t[kHvccBoxMaxSize]);

    ASSERT_NE(hvcc, nullptr) << "Failed to allocate a hvcc buffer of size: " << kHvccBoxMaxSize;



    err = hevcParams.makeHvcc(hvcc, &hvccBoxSize, kNALSizeLength);

    err = hevcParams.makeHvcc(hvcc.get(), &hvccBoxSize, kNALSizeLength);

    ASSERT_EQ(err, (status_t)OK) << "Unable to create hvcc box";



    ASSERT_GT(hvccBoxSize, kHvccBoxMinSize)
@@ -179,8 +178,6 @@ TEST_P(HEVCUtilsUnitTest, NALUnitTest) { 
    if (frameRate != mFrameRate)

        cout << "[   WARN   ] Expected frame rate: " << mFrameRate << " Found: " << frameRate

             << endl;



    free(hvcc);

}



// Info File contains the type and length for each chunk/frame

media/libstagefright/timedtext/test/TimedTextUnitTest.cpp

+4 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <string.h>

#include <sys/stat.h>

#include <fstream>

#include <memory>



#include <binder/Parcel.h>

#include <media/stagefright/foundation/AString.h>
@@ -240,10 +241,10 @@ TEST_P(Text3GPPDescriptionTest, Text3GPPGlobalDescriptionTest) { 


                    if (remaining < tempFontNameLength) break;

                    const uint8_t *tmpFont = tmpData;

                    char *tmpFontName = strndup((const char *)tmpFont, tempFontNameLength);

                    std::unique_ptr<char[]> tmpFontName(new char[tempFontNameLength]);

                    strncpy(tmpFontName.get(), (const char *)tmpFont, tempFontNameLength);

                    ASSERT_NE(tmpFontName, nullptr) << "Font Name is null";

                    ALOGI("FontName = %s", tmpFontName);

                    free(tmpFontName);

                    ALOGI("FontName = %s", tmpFontName.get());

                    tmpData += tempFontNameLength;

                    remaining -= tempFontNameLength;

                    fontRecordEntries.push_back({tempFontID, tempFontNameLength, tmpFont});