aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2013-09-08 18:28:11 +0200
committerClément Bœsch <u@pkh.me>2013-09-08 18:50:25 +0200
commit3a54c221d574ec944db1eddf9df895808f32bf9e (patch)
treebbf8a328a0323f112ce355aaa44968322ecba1f9
parent860a0810583f54ccbde912aebda8711f18eab8eb (diff)
downloadffmpeg-3a54c221d574ec944db1eddf9df895808f32bf9e.tar.gz
avcodec/srtdec: fix potential overread.
-rw-r--r--libavcodec/srtdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c
index 267561c866..b16645a01e 100644
--- a/libavcodec/srtdec.c
+++ b/libavcodec/srtdec.c
@@ -204,7 +204,8 @@ static const char *read_ts(const char *buf, int *ts_start, int *ts_end,
"%*[ ]X1:%u X2:%u Y1:%u Y2:%u",
&hs, &ms, &ss, ts_start, &he, &me, &se, ts_end,
x1, x2, y1, y2);
- buf += strcspn(buf, "\n") + 1;
+ buf += strcspn(buf, "\n");
+ buf += !!*buf;
if (c >= 8) {
*ts_start = 100*(ss + 60*(ms + 60*hs)) + *ts_start/10;
*ts_end = 100*(se + 60*(me + 60*he)) + *ts_end /10;