aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Rummell <jrummell@chromium.org>2020-03-30 14:08:01 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-19 17:17:36 +0200
commit8c73f802768b5d2506510ba69c2eb63da890161f (patch)
tree7bab5bb860de2a81df74fcfa4385cbb671ffcc4a
parent33bdb19d2378d16d70e8e3a473d16e1ad8906102 (diff)
downloadffmpeg-8c73f802768b5d2506510ba69c2eb63da890161f.tar.gz
libavformat/mov.c: Free aes_decrypt to avoid leaking memory
Found by Chromium fuzzers (crbug.com/1057205). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ad91cf1f2f5793db5c6dd7ab9947fcc6d7832607) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mov.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index feec372a61..dfa943819f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1004,6 +1004,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sha = av_sha_alloc();
if (!sha)
return AVERROR(ENOMEM);
+ av_free(c->aes_decrypt);
c->aes_decrypt = av_aes_alloc();
if (!c->aes_decrypt) {
ret = AVERROR(ENOMEM);