From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 21 Nov 2014 12:57:42 +0000 (+0000)
Subject: mpegenc: prevent a NULL pointer dereference
X-Git-Tag: v11.4~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cce99f72d1b49d3dfee859136eeff3db32553750;p=platform%2Fupstream%2Flibav.git

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>
---

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 88590b3..8a62c54 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)