[FFmpeg-cvslog] avformat/movenc: Check packet in mov_write_single_packet() too
ffmpeg | branch: release/3.0 | Michael Niedermayer| Thu Sep 15 23:52:54 2016 +0200| [7fefa4138ddd8b4841459075b5e124b38b3806ee] | committer: Michael Niedermayer avformat/movenc: Check packet in mov_write_single_packet() too Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer (cherry picked from commit 28343139330f557e00293933a4697c7d0fc19c56) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fefa4138ddd8b4841459075b5e124b38b3806ee --- libavformat/movenc.c | 4 1 file changed, 4 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6230f30..cdc3a00 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4650,6 +4650,10 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) int64_t frag_duration = 0; int size = pkt->size; +int ret = check_pkt(s, pkt); +if (ret < 0) +return ret; + if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { int i; for (i = 0; i < s->nb_streams; i++) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/movenc: Check packet in mov_write_single_packet() too
ffmpeg | branch: release/3.1 | Michael Niedermayer| Thu Sep 15 23:52:54 2016 +0200| [77c9c350930907b5201576573a70ffb8aaaec60f] | committer: Michael Niedermayer avformat/movenc: Check packet in mov_write_single_packet() too Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer (cherry picked from commit 28343139330f557e00293933a4697c7d0fc19c56) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77c9c350930907b5201576573a70ffb8aaaec60f --- libavformat/movenc.c | 4 1 file changed, 4 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 917fdaf..a283231 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4901,6 +4901,10 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) int64_t frag_duration = 0; int size = pkt->size; +int ret = check_pkt(s, pkt); +if (ret < 0) +return ret; + if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { int i; for (i = 0; i < s->nb_streams; i++) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/movenc: Check packet in mov_write_single_packet() too
ffmpeg | branch: release/2.8 | Michael Niedermayer| Thu Sep 15 23:52:54 2016 +0200| [0ffdabb58d3643ef377081074b44e59516ce2f2e] | committer: Michael Niedermayer avformat/movenc: Check packet in mov_write_single_packet() too Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer (cherry picked from commit 28343139330f557e00293933a4697c7d0fc19c56) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ffdabb58d3643ef377081074b44e59516ce2f2e --- libavformat/movenc.c | 5 + 1 file changed, 5 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c93872..e4acf5d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4567,10 +4567,15 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) AVCodecContext *enc = trk->enc; int64_t frag_duration = 0; int size = pkt->size; +int ret; if (!pkt->size) return 0; /* Discard 0 sized packets */ +ret = check_pkt(s, pkt); +if (ret < 0) +return ret; + if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { int i; for (i = 0; i < s->nb_streams; i++) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/movenc: Check packet in mov_write_single_packet() too
ffmpeg | branch: master | Michael Niedermayer| Thu Sep 15 23:52:54 2016 +0200| [28343139330f557e00293933a4697c7d0fc19c56] | committer: Michael Niedermayer avformat/movenc: Check packet in mov_write_single_packet() too Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28343139330f557e00293933a4697c7d0fc19c56 --- libavformat/movenc.c | 4 1 file changed, 4 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2d8fc48..b704f49 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4971,6 +4971,10 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) int64_t frag_duration = 0; int size = pkt->size; +int ret = check_pkt(s, pkt); +if (ret < 0) +return ret; + if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { int i; for (i = 0; i < s->nb_streams; i++) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog