CameraHal: Check if BS buffer is not in list

- Check that passed buffer is in current buffer
  source list. If no, return the buffer to caller
  instead of getting out of range.

Change-Id: I3acef6514049d1e1009f91ec4ec62688974223a1
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp
index b92f46e..3b0d480 100644
--- a/camera/BufferSourceAdapter.cpp
+++ b/camera/BufferSourceAdapter.cpp
@@ -705,6 +705,15 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame)
         }
     }
 
+    if (i >= mBufferCount) {
+        CAMHAL_LOGD("Can't find frame in buffer list");
+        if (frame->mFrameType != CameraFrame::REPROCESS_INPUT_FRAME) {
+            mFrameProvider->returnFrame(frame->mBuffer,
+                    static_cast<CameraFrame::FrameType>(frame->mFrameType));
+        }
+        return;
+    }
+
     handle = (buffer_handle_t *) mBuffers[i].opaque;
 
     // Handle input buffers