NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: gstreamer: Fix the destructor of GstreamerTest base class

Browse source 
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>
This commit is contained in:
Vedant Paranjape 2021-09-09 18:48:05 +05:30 • committed by Kieran Bingham
parent 68fe3b058a
commit 0eea207b04
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/gstreamer/gstreamer_test.cpp
View file

@ -24,6 +24,7 @@ const char *__asan_default_options()
} }
GstreamerTest::GstreamerTest() GstreamerTest::GstreamerTest()
: pipeline_(nullptr), libcameraSrc_(nullptr)
{ {
/* /*
* GStreamer by default spawns a process to run the * GStreamer by default spawns a process to run the
@ -69,12 +70,8 @@ GstreamerTest::GstreamerTest()
GstreamerTest::~GstreamerTest() GstreamerTest::~GstreamerTest()
{ {
if (libcameraSrc_ && g_clear_object(&pipeline_);
!gst_object_has_as_ancestor(GST_OBJECT(libcameraSrc_), g_clear_object(&libcameraSrc_);
GST_OBJECT(pipeline_)))
gst_object_unref(libcameraSrc_);
if (pipeline_)
gst_object_unref(pipeline_);
gst_deinit(); gst_deinit();
} }