Added extra malloc method to avoid early calls to the policy checks o…

…n Windows.
ImageMagick · Jun 24, 2022 · 57e7129 · 57e7129
1 parent 16f316e
commit 57e7129
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
@@ -21,6 +21,7 @@
 #include "MagickCore/delegate.h"
 #include "MagickCore/delegate-private.h"
 #include "MagickCore/exception.h"
+#include "MagickCore/memory_.h"
 #include "MagickCore/splay-tree.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
@@ -67,6 +68,20 @@ struct timezone
 
 #endif
 
+static inline void *NTAcquireQuantumMemory(const size_t count,
+  const size_t quantum)
+{
+  size_t
+    size;
+
+  if (HeapOverflowSanityCheckGetSize(count,quantum,&size) != MagickFalse)
+    {
+      errno=ENOMEM;
+      return(NULL);
+    }
+  return(AcquireMagickMemory(size));
+}
+
 extern MagickPrivate char
   *NTGetLastError(void);
 

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
@@ -184,7 +184,7 @@ static inline char *create_utf8_string(const wchar_t *wideChar)
   count=WideCharToMultiByte(CP_UTF8,0,wideChar,-1,NULL,0,NULL,NULL);
   if (count < 0)
     return((char *) NULL);
-  utf8=(char *) AcquireQuantumMemory(count+1,sizeof(*utf8));
+  utf8=(char *) NTAcquireQuantumMemory(count+1,sizeof(*utf8));
   if (utf8 == (char *) NULL)
     return((char *) NULL);
   count=WideCharToMultiByte(CP_UTF8,0,wideChar,-1,utf8,count,NULL,NULL);
@@ -231,7 +231,7 @@ static unsigned char *NTGetRegistryValue(HKEY root,const char *key,DWORD flags,
       LPBYTE
         wide;
 
-      wide=(LPBYTE) AcquireQuantumMemory((const size_t) size,sizeof(*wide));
+      wide=(LPBYTE) NTAcquireQuantumMemory((const size_t) size,sizeof(*wide));
       if (wide != (LPBYTE) NULL)
         {
           status=RegQueryValueExW(registry_key,wide_name,0,&type,wide,&size);
@@ -304,7 +304,7 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved)
         *wide_path;
 
       MagickCoreGenesis((const char *) NULL,MagickFalse);
-      wide_path=(wchar_t *) AcquireQuantumMemory(MagickPathExtent,
+      wide_path=(wchar_t *) NTAcquireQuantumMemory(MagickPathExtent,
         sizeof(*wide_path));
       if (wide_path == (wchar_t *) NULL)
         return(FALSE);
@@ -321,7 +321,8 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved)
                 module_path[count+1]='\0';
                 break;
               }
-          path=(char *) AcquireQuantumMemory(MagickPathExtent,16*sizeof(*path));
+          path=(char *) NTAcquireQuantumMemory(MagickPathExtent,
+            16*sizeof(*path));
           if (path == (char *) NULL)
             {
               module_path=DestroyString(module_path);
@@ -337,7 +338,7 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved)
                   char
                     *variable;
 
-                  variable=(char *) AcquireQuantumMemory(MagickPathExtent,
+                  variable=(char *) NTAcquireQuantumMemory(MagickPathExtent,
                     16*sizeof(*variable));
                   if (variable == (char *) NULL)
                     {
@@ -470,7 +471,7 @@ MagickPrivate char **NTArgvToUTF8(const int argc,wchar_t **argv)
   ssize_t
     i;
 
-  utf8=(char **) AcquireQuantumMemory(argc,sizeof(*utf8));
+  utf8=(char **) NTAcquireQuantumMemory(argc,sizeof(*utf8));
   if (utf8 == (char **) NULL)
     ThrowFatalException(ResourceLimitFatalError,"UnableToConvertStringToARGV");
   for (i=0; i < (ssize_t) argc; i++)

diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
@@ -79,7 +79,7 @@ static inline wchar_t *create_wchar_path(const char *utf8)
 
       (void) FormatLocaleString(buffer,MagickPathExtent,"\\\\?\\%s",utf8);
       count+=4;
-      longPath=(wchar_t *) AcquireQuantumMemory(count,sizeof(*longPath));
+      longPath=(wchar_t *) NTAcquireQuantumMemory(count,sizeof(*longPath));
       if (longPath == (wchar_t *) NULL)
         return((wchar_t *) NULL);
       count=MultiByteToWideChar(CP_UTF8,0,buffer,-1,longPath,count);
@@ -88,12 +88,12 @@ static inline wchar_t *create_wchar_path(const char *utf8)
       longPath=(wchar_t *) RelinquishMagickMemory(longPath);
       if ((count < 5) || (count >= MAX_PATH))
         return((wchar_t *) NULL);
-      wideChar=(wchar_t *) AcquireQuantumMemory((size_t) count-3,
+      wideChar=(wchar_t *) NTAcquireQuantumMemory((size_t) count-3,
         sizeof(*wideChar));
       wcscpy(wideChar,shortPath+4);
       return(wideChar);
     }
-  wideChar=(wchar_t *) AcquireQuantumMemory(count,sizeof(*wideChar));
+  wideChar=(wchar_t *) NTAcquireQuantumMemory(count,sizeof(*wideChar));
   if (wideChar == (wchar_t *) NULL)
     return((wchar_t *) NULL);
   count=MultiByteToWideChar(CP_UTF8,0,utf8,-1,wideChar,count);