[libcamera-devel] [PATCH 2/2] gst: pool: Fix GstBuffer leak on error

[Laurent Pinchart]

Hi Nicolas,

Thank you for the patch.

On Thu, Mar 11, 2021 at 03:52:55PM -0500, Nicolas Dufresne wrote:
> From: Nicolas Dufresne <nicolas.dufresne at collabora.com>
> 
> We borrowed a GstBuffer from the pool, if preparing the buffer failed,
> we need to push it back to avoid leaking it.
> 
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne at collabora.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> ---
>  src/gstreamer/gstlibcamerapool.cpp | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gstreamer/gstlibcamerapool.cpp b/src/gstreamer/gstlibcamerapool.cpp
> index 62db184f..1fde4213 100644
> --- a/src/gstreamer/gstlibcamerapool.cpp
> +++ b/src/gstreamer/gstlibcamerapool.cpp
> @@ -40,8 +40,10 @@ gst_libcamera_pool_acquire_buffer(GstBufferPool *pool, GstBuffer **buffer,
>  	if (!buf)
>  		return GST_FLOW_ERROR;
>  
> -	if (!gst_libcamera_allocator_prepare_buffer(self->allocator, self->stream, buf))
> +	if (!gst_libcamera_allocator_prepare_buffer(self->allocator, self->stream, buf)) {
> +		gst_atomic_queue_push(self->queue, buf);
>  		return GST_FLOW_ERROR;
> +	}
>  
>  	*buffer = buf;
>  	return GST_FLOW_OK;

-- 
Regards,

Laurent Pinchart