diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 13:59:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 14:14:12 +0100 |
| commit | 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad (patch) | |
| tree | 88b1049f8ab850682b5fbb56666b966e2c7a4571 | |
| parent | af786236cc61405e8d284e716c5ec2539316a1ad (diff) | |
| download | ffmpeg-842b6c14bcfc1c5da1a2d288fd65386eb8c158ad.tar.gz | |
avformat/mpegtsenc: Check data array size in mpegts_write_pmt()
Prevents out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegtsenc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 40ff85b7d6..6f075c5c4b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -259,7 +259,7 @@ static void mpegts_write_pat(AVFormatContext *s) data, q - data); } -static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) +static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) { MpegTSWrite *ts = s->priv_data; uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr; @@ -315,6 +315,10 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) stream_type = STREAM_TYPE_PRIVATE_DATA; break; } + + if (q - data > sizeof(data) - 32) + return AVERROR(EINVAL); + *q++ = stream_type; put16(&q, 0xe000 | ts_st->pid); desc_length_ptr = q; @@ -346,7 +350,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) len_ptr = q++; *len_ptr = 0; - for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next + 1) { + for (p = lang->value; next && *len_ptr < 255 / 4 * 4 && q - data < sizeof(data) - 4; p = next + 1) { next = strchr(p, ','); if (strlen(p) != 3 && (!next || next != p + 3)) continue; /* not a 3-letter code */ @@ -422,7 +426,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) *q++ = 0x56; len_ptr = q++; - while (strlen(language) >= 3) { + while (strlen(language) >= 3 && q - data < sizeof(data) - 6) { *q++ = *language++; *q++ = *language++; *q++ = *language++; @@ -476,6 +480,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) } mpegts_write_section1(&service->pmt, PMT_TID, service->sid, ts->tables_version, 0, 0, data, q - data); + return 0; } /* NOTE: str == NULL is accepted for an empty string */ |