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

Commit c36cdf16 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

Change-Id: I06aec170231079b7a5155d25974db2d356aab410
parents 880adb1f ce2cdf02
Loading
Loading
Loading
Loading
+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();