[FFmpeg-cvslog] random_seed: Replace a VLA with a normal array

Derek Buitenhuis git at videolan.org
Sat Sep 8 18:04:48 CEST 2012


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sat Sep  8 08:31:33 2012 -0400| [9ab538e31f8621ea7400a1d8bdf9d6091aa3dedf] | committer: Michael Niedermayer

random_seed: Replace a VLA with a normal array

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ab538e31f8621ea7400a1d8bdf9d6091aa3dedf
---

 libavutil/random_seed.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index e60ace0..d1a1fa6 100644
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -27,6 +27,7 @@
 #include <math.h>
 #include <time.h>
 #include <string.h>
+#include "avassert.h"
 #include "timer.h"
 #include "random_seed.h"
 #include "sha.h"
@@ -55,7 +56,7 @@ static int read_random(uint32_t *dst, const char *file)
 
 static uint32_t get_generic_seed(void)
 {
-    uint8_t tmp[av_sha_size];
+    uint8_t tmp[120];
     struct AVSHA *sha = (void*)tmp;
     clock_t last_t  = 0;
     static uint64_t i = 0;
@@ -63,6 +64,8 @@ static uint32_t get_generic_seed(void)
     unsigned char digest[32];
     uint64_t last_i = i;
 
+    av_assert0(sizeof(tmp) >= av_sha_size);
+
     if(TEST){
         memset(buffer, 0, sizeof(buffer));
         last_i = i = 0;



More information about the ffmpeg-cvslog mailing list