From 0eea207b04ec2764fc4f2bafa1ec6df831a74573 Mon Sep 17 00:00:00 2001 From: Vedant Paranjape Date: Thu, 9 Sep 2021 18:48:05 +0530 Subject: test: gstreamer: Fix the destructor of GstreamerTest base class The destructor tried to check if pipeline_ is a parent of libcameraSrc_. This was needed to be checked as if it is, cleanup of libcameraSrc_ would be handled by pipeline itself. Since, the destructor can be called anytime, even when pipeline_ hasn't been created, the use of pipeline_ to check if libcameraSrc_ has an ancestor as pipeline_ caused a segmentation fault. Fixes: f58768092277 ("test: gstreamer: Fix the destructor of GstreamerTest base class") Signed-off-by: Vedant Paranjape Reviewed-by: Jean-Michel Hautbois Reviewed-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- test/gstreamer/gstreamer_test.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/gstreamer/gstreamer_test.cpp b/test/gstreamer/gstreamer_test.cpp index dbdcaec0..41712505 100644 --- a/test/gstreamer/gstreamer_test.cpp +++ b/test/gstreamer/gstreamer_test.cpp @@ -24,6 +24,7 @@ const char *__asan_default_options() } GstreamerTest::GstreamerTest() + : pipeline_(nullptr), libcameraSrc_(nullptr) { /* * GStreamer by default spawns a process to run the @@ -69,12 +70,8 @@ GstreamerTest::GstreamerTest() GstreamerTest::~GstreamerTest() { - if (libcameraSrc_ && - !gst_object_has_as_ancestor(GST_OBJECT(libcameraSrc_), - GST_OBJECT(pipeline_))) - gst_object_unref(libcameraSrc_); - if (pipeline_) - gst_object_unref(pipeline_); + g_clear_object(&pipeline_); + g_clear_object(&libcameraSrc_); gst_deinit(); } -- cgit v1.2.1