From 8fc449b5ed321ee154a185ccbb0c9068e1fc6d66 Mon Sep 17 00:00:00 2001
From: TangoCash <eric@loxat.de>
Date: Fri, 10 Nov 2017 11:32:58 +0100
Subject: [PATCH 1/2] gstreamer playback: fix possible segfault

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/3e28504ef318f73e972ea4eba0a0cb10356cd819
Author: TangoCash <eric@loxat.de>
Date: 2017-11-10 (Fri, 10 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 libarmbox/playback_gst.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp
index f2f8d3c..9a62957 100644
--- a/libarmbox/playback_gst.cpp
+++ b/libarmbox/playback_gst.cpp
@@ -951,9 +951,9 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
 			//(ac3flags[i] > 2) ?	ac3flags[i] = 1 : ac3flags[i] = 0;
 
 			g_signal_emit_by_name (m_gst_playbin, "get-audio-tags", i, &tags);
-			if (tags && GST_IS_TAG_LIST(tags))
+			if (tags)
 			{
-				if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_lang))
+				if (GST_IS_TAG_LIST(tags) && gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_lang))
 				{
 					std::string slang;
 					if (gst_tag_check_language_code(g_lang))
@@ -1033,6 +1033,9 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
 
 			val = gst_tag_list_get_value_index(m_stream_tags, name, j);
 
+			if (val == NULL)
+				continue;
+
 			if (G_VALUE_HOLDS_STRING(val))
 			{
 				keys.push_back(name);

From 9d8a2ee2682412b41aa5fc73454a6988fad79105 Mon Sep 17 00:00:00 2001
From: TangoCash <eric@loxat.de>
Date: Fri, 10 Nov 2017 12:02:55 +0100
Subject: [PATCH 2/2] gstreamer playback: fix possible race condition

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5059eaa75bd72ba69b69682577d7a5b9596c6b17
Author: TangoCash <eric@loxat.de>
Date: 2017-11-10 (Fri, 10 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 libarmbox/playback_gst.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp
index 9a62957..c04c49c 100644
--- a/libarmbox/playback_gst.cpp
+++ b/libarmbox/playback_gst.cpp
@@ -1016,22 +1016,28 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
 {
 	keys.clear();
 	values.clear();
-	if (gst_tag_list_is_empty (m_stream_tags))
+
+	GstTagList *meta_list = gst_tag_list_copy(m_stream_tags);
+
+	if (meta_list == NULL)
 		return;
 
-	for (guint i = 0, icnt = gst_tag_list_n_tags(m_stream_tags); i < icnt; i++)
+	if (gst_tag_list_is_empty(meta_list))
+		return;
+
+	for (guint i = 0, icnt = gst_tag_list_n_tags(meta_list); i < icnt; i++)
 	{
-		const gchar *name = gst_tag_list_nth_tag_name(m_stream_tags, i);
+		const gchar *name = gst_tag_list_nth_tag_name(meta_list, i);
 		if (!name)
 		{
 			continue;
 		}
 
-		for (guint j = 0, jcnt = gst_tag_list_get_tag_size(m_stream_tags, name); j < jcnt; j++)
+		for (guint j = 0, jcnt = gst_tag_list_get_tag_size(meta_list, name); j < jcnt; j++)
 		{
 			const GValue *val;
 
-			val = gst_tag_list_get_value_index(m_stream_tags, name, j);
+			val = gst_tag_list_get_value_index(meta_list, name, j);
 
 			if (val == NULL)
 				continue;
@@ -1074,6 +1080,7 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
 
 		}
 	}
+	gst_tag_list_unref(meta_list);
 	printf("%s:%s %d tags found\n", FILENAME, __func__, (int)keys.size());
 }