Improve reading of faulty DVD SUP files - thx GCRaistlin :)

SubtitleEdit · May 1, 2020 · c38918f · c38918f
1 parent e488e82
commit c38918f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changelog.txt b/Changelog.txt
@@ -64,6 +64,7 @@
    * Add Arabic no-break-after list - thx OmrSi
    * Titlebar changed to: "*file - SE" - thx Signy13/GCRaistlin
    * Remove default alignment in TTML 1.0 - thx Arjan
+   * Improve reading of faulty DVD SUP files - thx GCRaistlin
 * FIXED:
    * Fix extraction from MKV via drag-n-drop - thx ryvec/Symos404/uckthis
    * Fix issue with line break in MS translate - thx cocowash

diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
@@ -12066,7 +12066,7 @@ private bool LoadTextSTFromMatroska(MatroskaTrackInfo matroskaSubtitleInfo, Matr
             {
                 _fileName = matroska.Path.Remove(matroska.Path.Length - 4) + GetCurrentSubtitleFormat().Extension;
             }
-            
+
             SetTitle();
             _fileDateTime = new DateTime();
             _converted = true;
@@ -13253,6 +13253,11 @@ private void ImportAndOcrSpDvdSup(string fileName, bool showInTaskbar)
 
                     buffer = new byte[SpHeader.SpHeaderLength];
                     bytesRead = fs.Read(buffer, 0, buffer.Length);
+                    while (bytesRead == buffer.Length && Encoding.ASCII.GetString(buffer, 0, 2) != "SP")
+                    {
+                        fs.Seek(fs.Position - buffer.Length + 1, SeekOrigin.Begin);
+                        bytesRead = fs.Read(buffer, 0, buffer.Length);
+                    }
                     header = new SpHeader(buffer);
                 }
             }