Merge commit '8729698d50739524665090e083d1bfdf28235724'

[ffmpeg] / libavcodec / ass_split.c

diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c
index 7ee48b4a5cb09a7af1f7478811977bccfa25ae1e..ddf4675acd69ede00086fdbc05054634b4e49e0f 100644 (file)
--- a/libavcodec/ass_split.c
+++ b/libavcodec/ass_split.c
@@ -267,7 +267,8 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
                     }
             }
         }
-        buf += strcspn(buf, "\n") + 1;
+        buf += strcspn(buf, "\n");
+        buf += !!*buf;
     }
     return buf;
 }
@@ -368,7 +369,7 @@ int ff_ass_split_override_codes(const ASSCodesCallbacks *callbacks, void *priv,
     char new_line[2];
     int text_len = 0;
 
-    while (*buf) {
+    while (buf && *buf) {
         if (text && callbacks->text &&
             (sscanf(buf, "\\%1[nN]", new_line) == 1 ||
              !strncmp(buf, "{\\", 2))) {