[FFmpeg-cvslog] oggdec: fix invalid free on error

wm4 git at videolan.org
Sat Sep 20 18:41:44 CEST 2014


ffmpeg | branch: release/2.2 | wm4 <nfxjfg at googlemail.com> | Sat Aug 30 15:39:15 2014 +0200| [f1685bd31a1921bb239e77ce852c7a0aa513017b] | committer: Michael Niedermayer

oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b173f5c15572cc82f68128599722e689df4ff137)

Conflicts:

	libavformat/oggdec.c

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

 libavformat/oggdec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index fd18e99..cf5d50d 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -795,7 +795,6 @@ retry:
                                                      10);
         if(side_data == NULL) {
             av_free_packet(pkt);
-            av_free(pkt);
             return AVERROR(ENOMEM);
         }
         AV_WL32(side_data + 4, os->end_trimming);



More information about the ffmpeg-cvslog mailing list