commit 20680f34956fd8c8b96c0c179112021129ba3cac
author Cristy <urban-warrior@imagemagick.org> Sat Nov 21 12:25:45 2020 +0000
committer Cristy <urban-warrior@imagemagick.org> Sat Nov 21 12:25:45 2020 +0000
tree 2c445d8fd259ab643905afdb051126a1822952ea
parent 2ff1794b8b474ffb6ec3bcaa3e7d910f66417189

...

MagickCore/delegate.c

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 9be3eab..364bcb8 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -536,11 +536,11 @@
 
   static char
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-    whitelist[] =
+    allowlist[] =
       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
       "$-_.+!;*(),{}|^~[]`\'><#%/?:@&=";
 #else
-    whitelist[] =
+    allowlist[] =
       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
       "$-_.+!;*(),{}|\\^~[]`\"><#%/?:@&=";
 #endif
@@ -548,7 +548,7 @@
   sanitize_source=AcquireString(source);
   p=sanitize_source;
   q=sanitize_source+strlen(sanitize_source);
-  for (p+=strspn(p,whitelist); p != q; p+=strspn(p,whitelist))
+  for (p+=strspn(p,allowlist); p != q; p+=strspn(p,allowlist))
     *p='_';
   return(sanitize_source);
 }

MagickCore/montage.c

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index b160197..30eaff7 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -340,7 +340,7 @@
   Image
     *image,
     **image_list,
-    **master_list,
+    **primary_list,
     *montage,
     *texture,
     *tile_image,
@@ -410,10 +410,10 @@
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
   number_images=GetImageListLength(images);
-  master_list=ImageListToArray(images,exception);
-  if (master_list == (Image **) NULL)
+  primary_list=ImageListToArray(images,exception);
+  if (primary_list == (Image **) NULL)
     return((Image *) NULL);
-  image_list=master_list;
+  image_list=primary_list;
   image=image_list[0];
   thumbnail=NewImageList();
   for (i=0; i < (ssize_t) number_images; i++)
@@ -445,7 +445,7 @@
       for (tile=0; (ssize_t) tile <= i; tile++)
         if (image_list[tile] != (Image *) NULL)
           image_list[tile]=DestroyImage(image_list[tile]);
-      master_list=(Image **) RelinquishMagickMemory(master_list);
+      primary_list=(Image **) RelinquishMagickMemory(primary_list);
       return((Image *) NULL);
     }
   /*
@@ -884,7 +884,7 @@
   if (texture != (Image *) NULL)
     texture=DestroyImage(texture);
   title=DestroyString(title);
-  master_list=(Image **) RelinquishMagickMemory(master_list);
+  primary_list=(Image **) RelinquishMagickMemory(primary_list);
   draw_info=DestroyDrawInfo(draw_info);
   clone_info=DestroyImageInfo(clone_info);
   return(GetFirstImageInList(montage));

MagickCore/string.c

diff --git a/MagickCore/string.c b/MagickCore/string.c
index cb5bce2..fc430cc 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -1588,14 +1588,14 @@
     *p;
 
   static char
-    whitelist[] =
+    allowlist[] =
       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
       "$-_.+!*'(),{}|\\^~[]`\"><#%;/?:@&=";
 
   sanitize_source=AcquireString(source);
   p=sanitize_source;
   q=sanitize_source+strlen(sanitize_source);
-  for (p+=strspn(p,whitelist); p != q; p+=strspn(p,whitelist))
+  for (p+=strspn(p,allowlist); p != q; p+=strspn(p,allowlist))
     *p='_';
   return(sanitize_source);
 }