Merge branch 'zero-mem-on-malloc'

libvips · Jan 18, 2019 · dcba364 · dcba364 · jcupitt · Jan 18, 2019
2 parents 4cbc280 + 0062242
commit dcba364
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -21,7 +21,10 @@
 - add @reduction_effort param to webpsave [lovell]
 
 4/1/19 started 8.7.4
-- fix memory leak in magickload [kleisauke]
+- magickload with magick6 API did not chain exceptions correctly causing a
+  memory leak under some conditions [kleisauke]
+- zero memory on allocate to prevent write of uninitialized memory under some 
+  error conditions [Balint Varga-Perke]
 
 21/11/18 started 8.7.3
 - fix infinite loop for autofit with non-scaleable font 

diff --git a/libvips/iofuncs/memory.c b/libvips/iofuncs/memory.c
@@ -173,7 +173,7 @@ vips_malloc( VipsObject *object, size_t size )
 {
 	void *buf;
 
-	buf = g_malloc( size );
+	buf = g_malloc0( size );
 
         if( object ) {
 		g_signal_connect( object, "postclose", 
@@ -317,7 +317,7 @@ vips_tracked_malloc( size_t size )
 	 */
 	size += 16;
 
-        if( !(buf = g_try_malloc( size )) ) {
+        if( !(buf = g_try_malloc0( size )) ) {
 #ifdef DEBUG
 		g_assert_not_reached();
 #endif /*DEBUG*/