Merge pull request #25323 from CastagnaIT/subs_carriagereturn

[CharArrayParser] Skip malformed EOL

1 files changed, 9 insertions, 1 deletions

diff --git a/xbmc/utils/CharArrayParser.cpp b/xbmc/utils/CharArrayParser.cpp
index 5aeec2040b..ec5af70a9c 100644
--- a/xbmc/utils/CharArrayParser.cpp
+++ b/xbmc/utils/CharArrayParser.cpp
@@ -156,11 +156,19 @@ bool CCharArrayParser::ReadNextLine(std::string& line)
   line.assign(m_data + m_position, lineLimit - m_position);
   m_position = lineLimit;
 
+  // Skip EOL chars
   if (m_data[m_position] == '\r')
   {
     m_position++;
+
+    if (m_data[m_position] == '\n')
+      m_position++;
+    // Malformed EOL as \r\r\n
+    else if (m_position + 1 <= m_limit && m_data[m_position] == '\r' &&
+             m_data[m_position + 1] == '\n')
+      m_position += 2;
   }
-  if (m_data[m_position] == '\n')
+  else if (m_data[m_position] == '\n')
   {
     m_position++;
   }