[FFmpeg-cvslog] lavf/tee: fix side data double free.

Nicolas George git at videolan.org
Sun Dec 13 18:56:26 CET 2015


ffmpeg | branch: release/2.8 | Nicolas George <george at nsup.org> | Sat Oct 10 15:19:43 2015 +0200| [1450a39ad495ad086b1110d15f999c0eeca92ef8] | committer: Michael Niedermayer

lavf/tee: fix side data double free.

Similar to 33fefdb44.
Fix trac ticket #4921.

Signed-off-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 1acc90eaa54ad82a21474ed759b8ed3a0f3d482d)

Conflicts:

	libavformat/tee.c

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1450a39ad495ad086b1110d15f999c0eeca92ef8
---

 libavformat/tee.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tee.c b/libavformat/tee.c
index bc2e522..a916841 100644
--- a/libavformat/tee.c
+++ b/libavformat/tee.c
@@ -409,6 +409,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
         }
 
         if (ret > 0) {
+            pkt->side_data = NULL;
+            pkt->side_data_elems = 0;
             av_free_packet(pkt);
             new_pkt.buf = av_buffer_create(new_pkt.data, new_pkt.size,
                                            av_buffer_default_free, NULL, 0);



More information about the ffmpeg-cvslog mailing list