summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorVedant Paranjape <vedantparanjape160201@gmail.com>2021-09-09 18:48:05 +0530
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-09-09 15:47:38 +0100
commit0eea207b04ec2764fc4f2bafa1ec6df831a74573 (patch)
tree91d92312ecb25d923cbd5b38847c2ac0c101a9a4 /test
parent68fe3b058afdf10710d02302f06f27bda5ef7fd4 (diff)
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 <vedantparanjape160201@gmail.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'test')
-rw-r--r--test/gstreamer/gstreamer_test.cpp9
1 files 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();
}