[PATCH v3 2/2] gstreamer: allocator: gst_libcamera_allocator_new(): Fix memory leak

[Kieran Bingham]

Quoting Barnabás Pőcze (2025-01-06 10:06:22)
> If `FrameBufferAllocator::allocate()` causes the construction to be
> aborted, the allocated `GstLibcameraAllocator` will not be
> deallocated properly. Use `g_autoptr()` to address this.
> 
> `g_steal_pointer()` could only be used in glib 2.68 or later because
> earlier it evaluates to a pointer-to-void in C++, which would necessitate
> a `static_cast`.
> 
> Signed-off-by: Barnabás Pőcze <pobrn at protonmail.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

This looks ok to me, but I suspect Nicolas' review is more valuable than
mine on this one.


Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> ---
> Changes in v3:
>   - fix #include order
> 
> Changes in v2:
>   - add `#include <utility>`
> ---
>  src/gstreamer/gstlibcameraallocator.cpp | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/gstreamer/gstlibcameraallocator.cpp b/src/gstreamer/gstlibcameraallocator.cpp
> index b0c84893a..d4492d994 100644
> --- a/src/gstreamer/gstlibcameraallocator.cpp
> +++ b/src/gstreamer/gstlibcameraallocator.cpp
> @@ -8,6 +8,8 @@
> 
>  #include "gstlibcameraallocator.h"
> 
> +#include <utility>
> +
>  #include <libcamera/camera.h>
>  #include <libcamera/framebuffer_allocator.h>
>  #include <libcamera/stream.h>
> @@ -199,15 +201,13 @@ GstLibcameraAllocator *
>  gst_libcamera_allocator_new(std::shared_ptr<Camera> camera,
>                             CameraConfiguration *config_)
>  {
> -       auto *self = GST_LIBCAMERA_ALLOCATOR(g_object_new(GST_TYPE_LIBCAMERA_ALLOCATOR,
> -                                                         nullptr));
> +       g_autoptr(GstLibcameraAllocator) self = GST_LIBCAMERA_ALLOCATOR(g_object_new(GST_TYPE_LIBCAMERA_ALLOCATOR,
> +                                                                                    nullptr));
>         gint ret;
> 
>         self->cm_ptr = new std::shared_ptr<CameraManager>(gst_libcamera_get_camera_manager(ret));
> -       if (ret) {
> -               g_object_unref(self);
> +       if (ret)
>                 return nullptr;
> -       }
> 
>         self->fb_allocator = new FrameBufferAllocator(camera);
>         for (StreamConfiguration &streamCfg : *config_) {
> @@ -228,7 +228,7 @@ gst_libcamera_allocator_new(std::shared_ptr<Camera> camera,
>                 g_hash_table_insert(self->pools, stream, pool);
>         }
> 
> -       return self;
> +       return std::exchange(self, nullptr);
>  }
> 
>  bool
> --
> 2.47.1
>