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

Commit dd7c0dd9 authored by Wei Jia's avatar Wei Jia
Browse files

Merge commit '5a289b87' into HEAD 

ABuffer: reset members when memory allocation fails.

Bug: 22077698
(cherry picked from commit 94b0badc)

Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
parents 7d113a23 5a289b87

media/libstagefright/foundation/ABuffer.cpp

+8 −3
Original line number Original line Diff line number Diff line
@@ -25,12 +25,17 @@ namespace android { 




ABuffer::ABuffer(size_t capacity)

ABuffer::ABuffer(size_t capacity)

    : mMediaBufferBase(NULL),

    : mMediaBufferBase(NULL),

      mData(malloc(capacity)),

      mCapacity(capacity),

      mRangeOffset(0),

      mRangeOffset(0),

      mRangeLength(capacity),

      mInt32Data(0),

      mInt32Data(0),

      mOwnsData(true) {

      mOwnsData(true) {

    mData = malloc(capacity);

    if (mData == NULL) {

        mCapacity = 0;

        mRangeLength = 0;

    } else {

        mCapacity = capacity;

        mRangeLength = capacity;

    }

}

}





ABuffer::ABuffer(void *data, size_t capacity)

ABuffer::ABuffer(void *data, size_t capacity)