# HG changeset patch
# User mosu
# Date 1074541867 0
# Node ID c4bd86214a20d3b1ea5627227747d50acf040104
# Parent  9a81d7b4c0b696890c78d9d5852c3a0b5a54a714
Fixed the subtitle line overflowing for SSA if there were too many \N in the subs.

diff -r 9a81d7b4c0b6 -r c4bd86214a20 libmpdemux/demux_mkv.c
--- a/libmpdemux/demux_mkv.c	Mon Jan 19 19:16:10 2004 +0000
+++ b/libmpdemux/demux_mkv.c	Mon Jan 19 19:51:07 2004 +0000
@@ -2265,6 +2265,12 @@
               mkv_d->clear_subs_at[mkv_d->subs.lines++]
                 = timecode + block_duration;
               *ptr2 = '\0';
+              if (mkv_d->subs.lines >= SUB_MAX_TEXT)
+                {
+                  mp_msg (MSGT_DEMUX, MSGL_WARN, "[mkv] Warning: too many "
+                          "sublines to render, skipping\n");
+                  return;
+                }
               ptr2 = mkv_d->subs.text[mkv_d->subs.lines];
               ptr1 += 2;
             }
@@ -2282,11 +2288,15 @@
             {
               if (state == 0)  /* normal char --> newline */
                 {
-                  if (mkv_d->subs.lines == SUB_MAX_TEXT - 1)
-                    break;
                   *ptr2 = '\0';
                   mkv_d->clear_subs_at[mkv_d->subs.lines++]
                     = timecode + block_duration;
+                  if (mkv_d->subs.lines >= SUB_MAX_TEXT)
+                    {
+                      mp_msg (MSGT_DEMUX, MSGL_WARN, "[mkv] Warning: too many "
+                              "sublines to render, skipping\n");
+                      return;
+                    }
                   ptr2 = mkv_d->subs.text[mkv_d->subs.lines];
                   state = 1;
                 }