[FFmpeg-cvslog] avcodec: Assert on codec->encode2 in encode_audio2

lummax git at videolan.org
Thu Aug 27 17:28:01 CEST 2015


ffmpeg | branch: master | lummax <luogpg at googlemail.com> | Thu Aug 27 12:40:30 2015 +0200| [0c800b27611cadd64f46fd1bbd9dc8bb87fe168b] | committer: Michael Niedermayer

avcodec: Assert on codec->encode2 in encode_audio2

Assert on `avctx->codec->encode2` to avoid a SEGFAULT on the subsequent
function call.

avcodec_encode_video2() uses a similar assertion.
Calling the wrong function on a stream is a serious inconsistency
which could at other places be potentially dangerous and exploitable,
it is thus safer to stop execution and not continue with such
inconsistency after returning an error.

Commit-message-extended-by commiter
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c800b27611cadd64f46fd1bbd9dc8bb87fe168b
---

 libavcodec/utils.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4da16ee..f51070c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1953,6 +1953,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
         }
     }
 
+    av_assert0(avctx->codec->encode2);
+
     ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
     if (!ret) {
         if (*got_packet_ptr) {



More information about the ffmpeg-cvslog mailing list