Browse Source

avformat/utils: Fix memleaks

ff_read_packet had potential memleaks:
1. If av_packet_make_refcounted fails, it means that the packet is not
refcounted, but it could nevertheless carry side data and therefore
needs to be unreferenced.
2. If putting a packet on a packet list fails, it wasn't unreferenced.

Furthermore, read_frame_internal leaked a packet's (side) data if a
context update was required and failed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
tags/n4.3
Andreas Rheinhardt James Almer 5 years ago
parent
commit
66d5e43b99
1 changed files with 12 additions and 4 deletions
  1. +12
    -4
      libavformat/utils.c

+ 12
- 4
libavformat/utils.c View File

@@ -872,8 +872,10 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
}

err = av_packet_make_refcounted(pkt);
if (err < 0)
if (err < 0) {
av_packet_unref(pkt);
return err;
}

if ((s->flags & AVFMT_FLAG_DISCARD_CORRUPT) &&
(pkt->flags & AV_PKT_FLAG_CORRUPT)) {
@@ -914,8 +916,10 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
err = ff_packet_list_put(&s->internal->raw_packet_buffer,
&s->internal->raw_packet_buffer_end,
pkt, 0);
if (err)
if (err < 0) {
av_packet_unref(pkt);
return err;
}
s->internal->raw_packet_buffer_remaining_size -= pkt->size;

if ((err = probe_codec(s, st, pkt)) < 0)
@@ -1608,15 +1612,19 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
}

ret = avcodec_parameters_to_context(st->internal->avctx, st->codecpar);
if (ret < 0)
if (ret < 0) {
av_packet_unref(&cur_pkt);
return ret;
}

#if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS
/* update deprecated public codec context */
ret = avcodec_parameters_to_context(st->codec, st->codecpar);
if (ret < 0)
if (ret < 0) {
av_packet_unref(&cur_pkt);
return ret;
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif



Loading…
Cancel
Save