[libcamera-devel,v2] test: gstreamer: Fix the destructor of GstreamerTest base class
diff mbox series

Message ID 20210908134338.402504-1-vedantparanjape160201@gmail.com
State Accepted
Headers show
Series
  • [libcamera-devel,v2] test: gstreamer: Fix the destructor of GstreamerTest base class
Related show

Commit Message

Vedant Paranjape Sept. 8, 2021, 1:43 p.m. UTC
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 <vedantparanjape160201@gmail.com>
---
 test/gstreamer/gstreamer_test.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Patch
diff mbox series

diff --git a/test/gstreamer/gstreamer_test.cpp b/test/gstreamer/gstreamer_test.cpp
index dbdcaec0b111..f1a40fcb062a 100644
--- a/test/gstreamer/gstreamer_test.cpp
+++ b/test/gstreamer/gstreamer_test.cpp
@@ -69,12 +69,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_);
+	gst_object_clear(pipeline_);
+	gst_object_clear(libcameraSrc_);
 
 	gst_deinit();
 }