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

Commit 41779c48 authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "Check frame handle validity before freeing buffer." into oc-dev

am: c9d2ceb9

Change-Id: I8d1dafc03a9a4bd9fdae836361298c9bf7890df3
parents 15fb0ee6 c9d2ceb9
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -972,6 +972,14 @@ void CameraSource::releaseRecordingFrame(const sp<IMemory>& frame) {
        }

        if (handle != nullptr) {
            ssize_t offset;
            size_t size;
            sp<IMemoryHeap> heap = frame->getMemory(&offset, &size);
            if (heap->getHeapID() != mMemoryHeapBase->getHeapID()) {
                ALOGE("%s: Mismatched heap ID, ignoring release (got %x, expected %x)",
		     __FUNCTION__, heap->getHeapID(), mMemoryHeapBase->getHeapID());
                return;
            }
            uint32_t batchSize = 0;
            {
                Mutex::Autolock autoLock(mBatchLock);