From c1ad93c08ce0b6ea2f4505267fe3aa7584701dca Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 9 Jun 2011 01:39:49 +0200 Subject: [PATCH] Revert "crypto: fix potential double free" This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a. Revert at authors request, and its buggy missing & --- libavformat/crypto.c | 6 ++++-- 1 file 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; }