[SCM] libav/experimental: memleak
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:54:48 UTC 2013
The following commit has been merged in the experimental branch:
commit eade86e2f5f5f267633583cab439b3b468b6a700
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jan 14 09:25:52 2007 +0000
memleak
Originally committed as revision 7462 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 0748516..7dc4bad 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -105,7 +105,7 @@ void av_aes_encrypt(AVAES *a){
// this is based on the reference AES code by Paulo Barreto and Vincent Rijmen
AVAES *av_aes_init(uint8_t *key, int keyBits) {
- AVAES *a= av_malloc(sizeof(AVAES));
+ AVAES *a;
int i, j, t, rconpointer = 0;
uint8_t tk[8][4];
int KC= keyBits/32;
@@ -131,11 +131,12 @@ AVAES *av_aes_init(uint8_t *key, int keyBits) {
}
}
- a->rounds= ROUNDS;
-
if(keyBits!=128 && keyBits!=192 && keyBits!=256)
return NULL;
+ a= av_malloc(sizeof(AVAES));
+ a->rounds= ROUNDS;
+
memcpy(tk, key, KC*4);
for(t= 0; t < (ROUNDS+1)*4; ) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list