diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-02 01:15:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 16:19:48 +0200 |
| commit | 1298aa83180edeb49cf7e4038e5a5edfc245cf43 (patch) | |
| tree | 1cf5c600f0864123e5fb298f2ddde388b077ad33 | |
| parent | e5fcc16a1fa7386e89277387f47f1b20b297304b (diff) | |
| download | ffmpeg-1298aa83180edeb49cf7e4038e5a5edfc245cf43.tar.gz | |
avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 81c1657a593b1c0f8e46fca00ead1d30ee1cd418)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dvdsub_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c index 9a6457e8b4..07ed4f72fc 100644 --- a/libavcodec/dvdsub_parser.c +++ b/libavcodec/dvdsub_parser.c @@ -45,8 +45,9 @@ static int dvdsub_parse(AVCodecParserContext *s, DVDSubParseContext *pc = s->priv_data; if (pc->packet_index == 0) { - if (buf_size < 2) + if (buf_size < 2 || AV_RB16(buf) && buf_size < 6) { return buf_size; + } pc->packet_len = AV_RB16(buf); if (pc->packet_len == 0) /* HD-DVD subpicture packet */ pc->packet_len = AV_RB32(buf+2); |