[libav-commits] mpegenc: prevent a NULL pointer dereference

Vittorio Giovara git at libav.org
Mon Nov 24 02:34:28 CET 2014


Module: libav
Branch: master
Commit: 065923b0781b06a2604f69f4e2c2407b7750a854

Author:    Vittorio Giovara <vittorio.giovara at gmail.com>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Fri Nov 21 12:57:42 2014 +0000

mpegenc: prevent a NULL pointer dereference

CC: libav-stable at libav.org
Bug-Id: CID 29261

---

 libavformat/mpegenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index fed03ed..9640893 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1057,7 +1057,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)



More information about the libav-commits mailing list