Signed-off-by: Marton Balint <c...@passwd.hu>
---
libavcodec/realtextdec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c
index 5084781123..bdd9659235 100644
--- a/libavcodec/realtextdec.c
+++ b/libavcodec/realtextdec.c
@@ -29,11 +29,11 @@
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
-static int rt_event_to_ass(AVBPrint *buf, const char *p)
+static int rt_event_to_ass(AVBPrint *buf, const char *p, const char *pend)
{
int prev_chr_is_space = 1;
- while (*p) {
+ while (p < pend && *p) {
if (*p != '<') {
if (!av_isspace(*p))
av_bprint_chars(buf, *p, 1);
@@ -41,7 +41,7 @@ static int rt_event_to_ass(AVBPrint *buf, const char *p)
av_bprint_chars(buf, ' ', 1);
prev_chr_is_space = av_isspace(*p);
} else {
- const char *end = strchr(p, '>');
+ const char *end = av_strnstr(p, ">", pend - p);
if (!end)
break;
if (!av_strncasecmp(p, "<br/>", 5) ||
@@ -65,7 +65,7 @@ static int realtext_decode_frame(AVCodecContext *avctx,
AVBPrint buf;
av_bprint_init(&buf, 0, 4096);
- if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr))
+ if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr, ptr +
avpkt->size))
ret = ff_ass_add_rect(sub, buf.str, s->readorder++, 0, NULL, NULL);
av_bprint_finalize(&buf, NULL);
if (ret < 0)
--
2.26.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
