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

Commit ccc02053 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev

* commit 'ef2c6e04':
  ABuffer: reset members when memory allocation fails.
parents 91860b89 ef2c6e04
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -25,12 +25,17 @@ namespace android {

ABuffer::ABuffer(size_t capacity)
    : mMediaBufferBase(NULL),
      mData(malloc(capacity)),
      mCapacity(capacity),
      mRangeOffset(0),
      mRangeLength(capacity),
      mInt32Data(0),
      mOwnsData(true) {
    mData = malloc(capacity);
    if (mData == NULL) {
        mCapacity = 0;
        mRangeLength = 0;
    } else {
        mCapacity = capacity;
        mRangeLength = capacity;
    }
}

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