lmmse_interpolate allocation fixes

LibRaw · Nov 27, 2010 · ffad73b · ffad73b
1 parent 693f7fe
commit ffad73b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,8 @@
+2010-11-27 Alex Tutubalin <lexa@lexa.ru>
+	* fixed bug with allocation size in lmmse_interpolate
+	* changed malloc to calloc to make valgrind happy with uninitialized
+	  values
+
 2010-11-20 Alex Tutubalin <lexa@lexa.ru>
 	   * OpenMP with LIBRAW_USE_OPENMP
 

diff --git a/lmmse_interpolate.c b/lmmse_interpolate.c
@@ -35,9 +35,9 @@ void CLASS lmmse_interpolate(int gamma_apply)
   rr1 = height + 2*ba;
   cc1 = width + 2*ba;
   if (gamma_apply)
-    buffer = (char *)malloc(rr1*cc1*24+65535*4);
+    buffer = (char *)calloc(rr1*cc1*6*sizeof(float)+65536*sizeof(float),1);
   else
-    buffer = (char *)malloc(rr1*cc1*24);
+    buffer = (char *)calloc(rr1*cc1*6*sizeof(float),1);
   merror(buffer,"lmmse_interpolate()");
   qix = (float (*)[6])buffer;
   if (gamma_apply) {