From 136b2623a6939971774e1d2d47bcec72eb2f1873 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 3 Nov 2017 22:25:11 +0100 Subject: [PATCH] gstreamer playback, fix possible segfault Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/161feb4cf4de363843c5bd475c0aab05f363e723 Author: TangoCash Date: 2017-11-03 (Fri, 03 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, 6 insertions(+), 1 deletion(-) diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp index 71275f3..671973c 100644 --- a/libarmbox/playback_gst.cpp +++ b/libarmbox/playback_gst.cpp @@ -948,7 +948,12 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu { if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_lang)) { - language[i] = std::string(gst_tag_get_language_name(g_lang)).c_str(); + std::string slang; + slang = gst_tag_get_language_name(g_lang); + if (slang.empty()) + language[i] = "unk"; + else + language[i] = slang.c_str(); lt_info("%s: language:%s\n", __FUNCTION__, language[i].c_str()); g_free(g_lang); }