cirros-testvm/src-cirros/buildroot-2015.05/package/ffmpeg/0010-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch

   1 From cb7c19124165508ae5f38a385a14f9c13b096a27 Mon Sep 17 00:00:00 2001
   2 From: Joakim Plate <elupus@ecce.se>
   3 Date: Fri, 26 Nov 2010 20:56:48 +0000
   4 Subject: [PATCH 10/13] fixed: memleak in mpegts demuxer on some malformed (??)
   5  mpegts files with too large pes packets
   6
   7 at-visions sample file brokenStream.mpg
   8
   9 Patch part of the XBMC patch set for ffmpeg, downloaded from
  10 https://github.com/xbmc/FFmpeg/.
  11
  12 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  13 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  14 ---
  15  libavformat/mpegts.c | 6 ++++++
  16  1 file changed, 6 insertions(+)
  17
  18 diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
  19 index d5a8a45..e070f1f 100644
  20 --- a/libavformat/mpegts.c
  21 +++ b/libavformat/mpegts.c
  22 @@ -832,6 +832,10 @@ static void reset_pes_packet_state(PESContext *pes)
  23
  24  static void new_pes_packet(PESContext *pes, AVPacket *pkt)
  25  {
  26 +    if(pkt->data) {
  27 +      av_log(pes->stream, AV_LOG_ERROR, "ignoring previously allocated packet on stream %d\n", pkt->stream_index);
  28 +      av_free_packet(pkt);
  29 +    }
  30      av_init_packet(pkt);
  31
  32      pkt->buf  = pes->buffer;
  33 @@ -2649,6 +2653,8 @@ static int mpegts_read_packet(AVFormatContext *s, AVPacket *pkt)
  34
  35      pkt->size = -1;
  36      ts->pkt = pkt;
  37 +    ts->pkt->data = NULL;
  38 +
  39      ret = handle_packets(ts, 0);
  40      if (ret < 0) {
  41          av_free_packet(ts->pkt);
  42 --
  43 2.1.0
  44