diff options
| author | Marton Balint <cus@passwd.hu> | 2017-02-08 23:28:21 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2017-02-19 16:41:43 +0100 |
| commit | 8985e4af2bba6b2eb901693a6202e998b9929a68 (patch) | |
| tree | a130d4e10555c958fc331103fd5e001873ebedc8 /libavformat/fifo.c | |
| parent | b921b3b42b61a3dff19157bf3eec1f6f38a2cae7 (diff) | |
| download | ffmpeg-8985e4af2bba6b2eb901693a6202e998b9929a68.tar.gz | |
avformat/fifo: assert on disallowed message type and state combinations
Fixes Coverity CID 1396277.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/fifo.c')
| -rw-r--r-- | libavformat/fifo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 8f525e56cb..2cbe5c56af 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -19,6 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/opt.h" #include "libavutil/time.h" #include "libavutil/thread.h" @@ -207,7 +208,7 @@ static int fifo_thread_write_trailer(FifoThreadContext *ctx) static int fifo_thread_dispatch_message(FifoThreadContext *ctx, FifoMessage *msg) { - int ret; + int ret = AVERROR(EINVAL); if (!ctx->header_written) { ret = fifo_thread_write_header(ctx); @@ -217,6 +218,7 @@ static int fifo_thread_dispatch_message(FifoThreadContext *ctx, FifoMessage *msg switch(msg->type) { case FIFO_WRITE_HEADER: + av_assert0(ret >= 0); return ret; case FIFO_WRITE_PACKET: return fifo_thread_write_packet(ctx, &msg->pkt); @@ -224,6 +226,7 @@ static int fifo_thread_dispatch_message(FifoThreadContext *ctx, FifoMessage *msg return fifo_thread_flush_output(ctx); } + av_assert0(0); return AVERROR(EINVAL); } |