commit 566eaf17a9071a1e5b5c402d69493122c7b5ad2d
author Cristy <urban-warrior@imagemagick.org> Sun Nov 15 17:46:43 2020 +0000
committer Cristy <urban-warrior@imagemagick.org> Sun Nov 15 17:46:43 2020 +0000
tree 5a0d3d74db1e3385bddc18c6ac14e67bb77676f7
parent e2963962372e250df5427c6052bd2eaa81e33c3a

prefer AcquireQuantumMemory() over ResizeMagickMemory()

MagickCore/display.c

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 8b5ae7d..0beaf23 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -2221,7 +2221,7 @@
   /*
     Initialize annotate structure.
   */
-  annotate_info=(XAnnotateInfo *) AcquireMagickMemory(sizeof(*annotate_info));
+  annotate_info=(XAnnotateInfo *) AcquireQuantumMemory(1,sizeof(*annotate_info));
   if (annotate_info == (XAnnotateInfo *) NULL)
     return(MagickFalse);
   XGetAnnotateInfo(annotate_info);
@@ -2504,7 +2504,7 @@
                 p=annotate_info->text;
                 break;
               }
-            annotate_info->next=(XAnnotateInfo *) AcquireMagickMemory(
+            annotate_info->next=(XAnnotateInfo *) AcquireQuantumMemory(1,
               sizeof(*annotate_info->next));
             if (annotate_info->next == (XAnnotateInfo *) NULL)
               return(MagickFalse);
@@ -2599,7 +2599,7 @@
               p=annotate_info->text;
               continue;
             }
-          annotate_info->next=(XAnnotateInfo *) AcquireMagickMemory(
+          annotate_info->next=(XAnnotateInfo *) AcquireQuantumMemory(1,
             sizeof(*annotate_info->next));
           if (annotate_info->next == (XAnnotateInfo *) NULL)
             return(MagickFalse);
@@ -13649,7 +13649,7 @@
   /*
     Expand the filenames.
   */
-  filelist=(char **) AcquireMagickMemory(sizeof(*filelist));
+  filelist=(char **) AcquireQuantumMemory(1,sizeof(*filelist));
   if (filelist == (char **) NULL)
     {
       ThrowXWindowException(ResourceLimitError,"MemoryAllocationFailed",