diff options
| author | wm4 <nfxjfg@googlemail.com> | 2014-08-30 15:39:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:44:37 +0100 |
| commit | 17f30ab6a154e18e3d7b6bf57490dc971cd274ca (patch) | |
| tree | 672c58305feca256e41d88873302b7261695f52d | |
| parent | 8c8950f982c5473e5e95d3a7f421d8464be25471 (diff) | |
| download | ffmpeg-17f30ab6a154e18e3d7b6bf57490dc971cd274ca.tar.gz | |
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@gmx.at>
(cherry picked from commit b173f5c15572cc82f68128599722e689df4ff137)
Conflicts:
libavformat/oggdec.c
(cherry picked from commit a82401b7284e05e2cf6fb89aeed53738af06a7fd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/oggdec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index e052c27da8..d6e09b4e08 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -780,7 +780,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); |