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

Commit 389c6ede authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am: ce2cdf02 

am: c36cdf16

Change-Id: I113d6d04f01f61be1e5837c13bf9d51731caab55
parents 56007baa c36cdf16

media/libstagefright/CameraSource.cpp

+8 −0
Original line number Diff line number Diff line
@@ -950,6 +950,14 @@ void CameraSource::releaseRecordingFrame(const sp<IMemory>& frame) { 


        if (handle != nullptr) {

            // Frame contains a VideoNativeHandleMetadata. Send the handle back to camera.

            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;

            }

            releaseRecordingFrameHandle(handle);

            mMemoryBases.push_back(frame);

            mMemoryBaseAvailableCond.signal();