diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-21 12:57:42 +0000 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-01-13 00:16:40 +0100 |
commit | cce99f72d1b49d3dfee859136eeff3db32553750 (patch) | |
tree | 368f1ebc2eaffbea7d87b8a96086338f8aa7da37 | |
parent | fbc20c3b85be169389b6c9f8806a311d3dea91ea (diff) | |
download | ffmpeg-cce99f72d1b49d3dfee859136eeff3db32553750.tar.gz |
mpegenc: prevent a NULL pointer dereference
CC: libav-stable@libav.org
Bug-Id: CID 29261
(cherry picked from commit 065923b0781b06a2604f69f4e2c2407b7750a854)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r-- | libavformat/mpegenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 88590b305b..8a62c54c32 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1052,7 +1052,7 @@ retry: es_size -= stream->premux_packet->unwritten_size; stream->premux_packet = stream->premux_packet->next; } - if (es_size) + if (stream->premux_packet && es_size) stream->premux_packet->unwritten_size -= es_size; if (remove_decoded_packets(ctx, s->last_scr) < 0) |