Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: actually enforce the stream limit

2017-11-26 Thread Michael Niedermayer 
On Sun, Nov 26, 2017 at 02:03:09PM -0300, James Almer wrote:
> Prevents out of array accesses. Adressess ticket #6873
> 
> Signed-off-by: James Almer 
> ---
>  libavformat/matroskaenc.c | 7 +++
>  1 file changed, 7 insertions(+)

LGTM

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is dangerous to be right in matters on which the established authorities
are wrong. -- Voltaire


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avformat/matroskaenc: actually enforce the stream limit

2017-11-26 Thread James Almer 
Prevents out of array accesses. Adressess ticket #6873

Signed-off-by: James Almer 
---
 libavformat/matroskaenc.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index dad6d6c93f..06126781f8 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1859,6 +1859,13 @@ static int mkv_write_header(AVFormatContext *s)
 av_dict_get(s->metadata, "alpha_mode", NULL, 0))
 version = 4;
 
+if (s->nb_streams > MAX_TRACKS) {
+av_log(s, AV_LOG_ERROR,
+   "At most %d streams are supported for muxing in Matroska\n",
+   MAX_TRACKS);
+return AVERROR(EINVAL);
+}
+
 for (i = 0; i < s->nb_streams; i++) {
 if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_ATRAC3 ||
 s->streams[i]->codecpar->codec_id == AV_CODEC_ID_COOK ||
-- 
2.15.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel