Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 12770701856a05b6b3cd706f708f8e9a4e8a1336 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Niedermayer <michaelni@gmx.at> |
| 3 | Date: Thu, 13 Feb 2014 13:59:51 +0100 |
| 4 | Subject: [PATCH] avformat/mpegtsenc: Check data array size in |
| 5 | mpegts_write_pmt() |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | |
| 9 | COmmit 12770701856a05b6b3cd706f708f8e9a4e8a1336 release/0.11 |
| 10 | |
| 11 | Prevents out of array writes |
| 12 | |
| 13 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 14 | (cherry picked from commit 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad) |
| 15 | |
| 16 | Conflicts: |
| 17 | |
| 18 | libavformat/mpegtsenc.c |
| 19 | (cherry picked from commit e87de3f50b765134588d0b048c32ed4b8acc16fb) |
| 20 | |
| 21 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 22 | --- |
| 23 | libavformat/mpegtsenc.c | 9 +++++++-- |
| 24 | 1 files changed, 7 insertions(+), 2 deletions(-) |
| 25 | |
| 26 | diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c |
| 27 | index 793e205..a12d19f 100644 |
| 28 | --- a/gst-libs/ext/libav/libavformat/mpegtsenc.c |
| 29 | +++ b/gst-libs/ext/libav/libavformat/mpegtsenc.c |
| 30 | @@ -240,7 +240,7 @@ static void mpegts_write_pat(AVFormatContext *s) |
| 31 | data, q - data); |
| 32 | } |
| 33 | |
| 34 | -static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
| 35 | +static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
| 36 | { |
| 37 | // MpegTSWrite *ts = s->priv_data; |
| 38 | uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr; |
| 39 | @@ -293,6 +293,10 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
| 40 | stream_type = STREAM_TYPE_PRIVATE_DATA; |
| 41 | break; |
| 42 | } |
| 43 | + |
| 44 | + if (q - data > sizeof(data) - 32) |
| 45 | + return AVERROR(EINVAL); |
| 46 | + |
| 47 | *q++ = stream_type; |
| 48 | put16(&q, 0xe000 | ts_st->pid); |
| 49 | desc_length_ptr = q; |
| 50 | @@ -324,7 +328,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
| 51 | len_ptr = q++; |
| 52 | *len_ptr = 0; |
| 53 | |
| 54 | - for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next + 1) { |
| 55 | + for (p = lang->value; next && *len_ptr < 255 / 4 * 4 && q - data < sizeof(data) - 4; p = next + 1) { |
| 56 | next = strchr(p, ','); |
| 57 | if (strlen(p) != 3 && (!next || next != p + 3)) |
| 58 | continue; /* not a 3-letter code */ |
| 59 | @@ -386,6 +390,7 @@ static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) |
| 60 | } |
| 61 | mpegts_write_section1(&service->pmt, PMT_TID, service->sid, 0, 0, 0, |
| 62 | data, q - data); |
| 63 | + return 0; |
| 64 | } |
| 65 | |
| 66 | /* NOTE: str == NULL is accepted for an empty string */ |
| 67 | -- |
| 68 | 1.7.5.4 |
| 69 | |