Skip to content
Permalink
Browse files

Merge branch 'zero-mem-on-malloc'

  • Loading branch information...
jcupitt committed Jan 18, 2019
2 parents 4cbc280 + 0062242 commit dcba364efa7b9a0ca7cf3fc3a85444436feafa6e
Showing with 6 additions and 3 deletions.
  1. +4 −1 ChangeLog
  2. +2 −2 libvips/iofuncs/memory.c
@@ -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
@@ -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*/

3 comments on commit dcba364

@jcupitt

This comment has been minimized.

Copy link
Member Author

replied Jan 18, 2019

@kleisauke could you mail me on jcupitt@gmail.com about this change? Sorry, I don't seem to have your email address :-(

@kleisauke

This comment has been minimized.

Copy link
Member

replied Jan 18, 2019

@jcupitt Did you mean this change?

@jcupitt

This comment has been minimized.

Copy link
Member Author

replied Jan 18, 2019

No, the gmalloc0 one (should be above).

Please sign in to comment.
You can’t perform that action at this time.