31 lines
941 B
Diff
31 lines
941 B
Diff
From 875fdf773d6e822364f876bed14c1785a01b45a7 Mon Sep 17 00:00:00 2001
|
|
From: Cristy <urban-warrior@imagemagick.org>
|
|
Date: Mon, 16 Nov 2020 23:18:42 +0000
|
|
Subject: [PATCH] revert whitelist mod
|
|
|
|
---
|
|
magick/string.c | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
diff --git a/magick/string.c b/magick/string.c
|
|
index 7f6eebc3b..c8ffa086f 100644
|
|
--- a/magick/string.c
|
|
+++ b/magick/string.c
|
|
@@ -1604,15 +1604,9 @@ MagickExport char *SanitizeString(const char *source)
|
|
*p;
|
|
|
|
static char
|
|
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
|
|
whitelist[] =
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
|
|
- "$-_.+!;*(),{}|^~[]`\'><#%/?:@&=";
|
|
-#else
|
|
- whitelist[] =
|
|
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
|
|
- "$-_.+!;*(),{}|\\^~[]`\"><#%/?:@&=";
|
|
-#endif
|
|
+ "$-_.+!*'(),{}|\\^~[]`\"><#%;/?:@&=";
|
|
|
|
sanitize_source=AcquireString(source);
|
|
p=sanitize_source;
|