]> git.sesse.net Git - ffmpeg/commitdiff
avformat/utils: unref packet on AVInputFormat.read_packet() failure
authorJames Almer <jamrial@gmail.com>
Fri, 20 Sep 2019 20:39:09 +0000 (22:39 +0200)
committerJames Almer <jamrial@gmail.com>
Wed, 25 Sep 2019 23:53:05 +0000 (20:53 -0300)
Demuxers may have allocated a packet before encountering an error and aborting.

Fixes ticket #8150

Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/utils.c

index a7f2582e0ebe69953e6bbb84bb489431ae750974..4657ba264264f2fe3e4f6f1a1713413783394924 100644 (file)
@@ -854,6 +854,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
         av_init_packet(pkt);
         ret = s->iformat->read_packet(s, pkt);
         if (ret < 0) {
+            av_packet_unref(pkt);
+
             /* Some demuxers return FFERROR_REDO when they consume
                data and discard it (ignored streams, junk, extradata).
                We must re-call the demuxer to get the real packet. */