aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-09 01:39:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-09 01:39:49 +0200
commitc1ad93c08ce0b6ea2f4505267fe3aa7584701dca (patch)
treeb7e773bf149f49d9fa845434e221b8de5442487e /libavformat
parent1fe3bf3e4b4f4a456204cc9512d0f7088231d109 (diff)
downloadffmpeg-c1ad93c08ce0b6ea2f4505267fe3aa7584701dca.tar.gz
Revert "crypto: fix potential double free"
This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a. Revert at authors request, and its buggy missing &
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/crypto.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 03bfeddba4..789a4d1e76 100644
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -97,8 +97,8 @@ static int crypto_open(URLContext *h, const char *uri, int flags)
return 0;
err:
- av_freep(c->key);
- av_freep(c->iv);
+ av_free(c->key);
+ av_free(c->iv);
return ret;
}
@@ -157,6 +157,8 @@ static int crypto_close(URLContext *h)
if (c->hd)
ffurl_close(c->hd);
av_freep(&c->aes);
+ av_freep(&c->key);
+ av_freep(&c->iv);
return 0;
}