From 283cf06bec52ff418a68d640176901207c7c6980 Mon Sep 17 00:00:00 2001 From: Cristy Date: Tue, 4 Jun 2019 20:59:23 -0400 Subject: [PATCH] ... --- ChangeLog | 2 ++ MagickCore/memory.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 963934f7f..7c3a2324e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ 2019-06-03 7.0.8-49 Cristy * Add support for RGB565 image format (reference https://imagemagick.org/discourse-server/viewtopic.php?f=2&t=36078). + * Use user defined allocator instead of `malloc` (reference + https://github.com/ImageMagick/ImageMagick6/pull/49/). 2019-06-01 7.0.8-48 Cristy * Release ImageMagick version 7.0.8-48, GIT revision 15689:061a3bb82:20190601 diff --git a/MagickCore/memory.c b/MagickCore/memory.c index ae135c0a2..1c92f15da 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -285,7 +285,7 @@ MagickExport void *AcquireAlignedMemory(const size_t count,const size_t quantum) extent=(size+alignment-1)+sizeof(void *); if (extent > size) { - p=malloc(extent); + p=AcquireMagickMemory(extent); if (p != NULL) { memory=(void *) AlignedExtent((size_t) p+sizeof(void *),alignment); @@ -1038,7 +1038,7 @@ MagickExport void *RelinquishAlignedMemory(void *memory) #elif defined(MAGICKCORE_HAVE__ALIGNED_MALLOC) _aligned_free(memory); #else - free(*((void **) memory-1)); + RelinquishMagickMemory(*((void **) memory-1)); #endif return(NULL); } -- 2.40.0