[FFmpeg-cvslog] Revert "crypto: fix potential double free"
Michael Niedermayer
git at videolan.org
Thu Jun 9 02:51:39 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 9 01:39:49 2011 +0200| [c1ad93c08ce0b6ea2f4505267fe3aa7584701dca] | committer: Michael Niedermayer
Revert "crypto: fix potential double free"
This reverts commit 7d89f7cbf3ccd98f9a5f58db97effa9afd2d571a.
Revert at authors request, and its buggy missing &
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1ad93c08ce0b6ea2f4505267fe3aa7584701dca
---
libavformat/crypto.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 03bfedd..789a4d1 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;
}
More information about the ffmpeg-cvslog
mailing list