Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2014-08-30 17:39:15 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-09-20 20:40:32 +0400
commitf1685bd31a1921bb239e77ce852c7a0aa513017b (patch)
tree3934423646d1aad296341264f2a193564eb5ffd7
parent8d10d6e1273817315878bcbb37e37de442585b27 (diff)
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
-rw-r--r--libavformat/oggdec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index fd18e99869..cf5d50d45e 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);