[FFmpeg-cvslog] avcodec/parser: Check that the parser return code is valid
Michael Niedermayer
git at videolan.org
Thu Jan 15 21:29:05 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 9 13:02:44 2015 +0100| [e7d85186d639a53a4563c5f65322190ae9ad8a83] | committer: Michael Niedermayer
avcodec/parser: Check that the parser return code is valid
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7d85186d639a53a4563c5f65322190ae9ad8a83
---
libavcodec/parser.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 2c03b7e..aa25481 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -23,6 +23,7 @@
#include <stdint.h>
#include <string.h>
+#include "libavutil/avassert.h"
#include "libavutil/atomic.h"
#include "libavutil/mem.h"
@@ -163,6 +164,7 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx,
/* WARNING: the returned index can be negative */
index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf,
poutbuf_size, buf, buf_size);
+ av_assert0(index > -0x20000000); // The API does not allow returning AVERROR codes
/* update the file pointer */
if (*poutbuf_size) {
/* fill the data for the current frame */
More information about the ffmpeg-cvslog
mailing list