Added nullptr check when resolving chapterName.

RickDB · Sep 2, 2017 · cce1b0c · cce1b0c
1 parent e45aa1a
commit cce1b0c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/xbmc/cores/DSPlayer/ChaptersManager.cpp b/xbmc/cores/DSPlayer/ChaptersManager.cpp
@@ -157,8 +157,13 @@ bool CChaptersManager::LoadChapters()
 
       if (SUCCEEDED(m_pIAMExtendedSeeking->GetMarkerName(i, &chapterName)))
       {
-        g_charsetConverter.wToUTF8(chapterName, infos->name);
-        SysFreeString(chapterName);
+		  if (chapterName)
+		  {
+			  g_charsetConverter.wToUTF8(chapterName, infos->name);
+			  SysFreeString(chapterName);
+		  }
+		  else
+			  infos->name = "Unknown chapter";
       }
       else
         infos->name = "Unknown chapter";