Merge pull request #170 from gipawu/Nexus

Fix crash on some channels
kodi-pvr · Jan 7, 2022 · 021a238 · 021a238
2 parents a0c0b0b + 192202b
commit 021a238
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pvr.vdr.vnsi/addon.xml.in b/pvr.vdr.vnsi/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="20.2.0"
+  version="20.2.1"
   name="VDR VNSI Client"
   provider-name="Team Kodi, FernetMenta">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.vdr.vnsi/changelog.txt b/pvr.vdr.vnsi/changelog.txt
@@ -1,3 +1,6 @@
+v20.2.1
+- Fix crash on some channels
+
 v20.2.0
 - Translation updates by Weblate
 - Kodi main API update to version 2.0.0

diff --git a/src/InputstreamDemux.cpp b/src/InputstreamDemux.cpp
@@ -386,8 +386,11 @@ void cVNSIDemux::StreamChange(cResponsePacket* resp)
       const char* language = resp->extract_String();
       uint32_t composition_id(resp->extract_U32());
       uint32_t ancillary_id(resp->extract_U32());
-      props.SetLanguage(language);
-      props.SetSubtitleInfo((composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16));
+      if (std::strlen(language) == 3)
+      {
+        props.SetLanguage(language);
+        props.SetSubtitleInfo((composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16));
+      }
     }
     else if (codecId.GetCodecType() == PVR_CODEC_TYPE_RDS)
     {