Commit 08328d834 for imagemagick.org
commit 08328d8343e441a073d1b56e0e4ebac2c02fac28
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sun Sep 6 22:00:19 2026 -0400
revert
diff --git a/MagickCore/color.c b/MagickCore/color.c
index f3b45397f..651695012 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2031,7 +2031,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *cache,const char *xml,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 2541bbfa8..6fafa67ca 100644
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1198,7 +1198,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *cache,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 6313dbdcc..ffa5a9c7e 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -2107,7 +2107,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *cache,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 762c63ced..f695af150 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -1222,7 +1222,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *cache,const char *xml,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 27195695c..9aaac861b 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -949,7 +949,7 @@ static MagickBooleanType LoadLogCache(LinkedListInfo *cache,const char *xml,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 813453954..d7ab1ad84 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -804,7 +804,7 @@ static void LoadOpenCLDeviceBenchmark(MagickCLEnv clEnv,const char *xml)
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 4dc1e67dd..da4f3813a 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -1147,7 +1147,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *cache,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/MagickCore/type.c b/MagickCore/type.c
index e6429289a..57a281aea 100644
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -1123,7 +1123,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
/*
Doctype element.
*/
- while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '>') && (*q != '\0'))
+ while ((LocaleNCompare(q,"]>",2) != 0) && (*q != '\0'))
(void) GetNextToken(q,&q,extent,token);
continue;
}
diff --git a/config/policy-limited.xml b/config/policy-limited.xml
index de30e48f1..40dfda3f0 100644
--- a/config/policy-limited.xml
+++ b/config/policy-limited.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
<!ELEMENT policymap (policy)*>
- <!ATTLIST policymap xmlns CDATA #FIXED ''>
+ <!ATTLIST policymap xmlns CDATA #FIXED "">
<!ELEMENT policy EMPTY>
- <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
- name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
- stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+ <!ATTLIST policy xmlns CDATA #FIXED "">
+ <!ATTLIST policy domain NMTOKEN #REQUIRED>
+ <!ATTLIST policy name NMTOKEN #IMPLIED>
+ <!ATTLIST policy pattern CDATA #IMPLIED>
+ <!ATTLIST policy rights NMTOKEN #IMPLIED>
+ <!ATTLIST policy stealth NMTOKEN #IMPLIED>
+ <!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Creating a security policy that fits your specific local environment
diff --git a/config/policy-open.xml b/config/policy-open.xml
index 016911738..20c1e32e9 100644
--- a/config/policy-open.xml
+++ b/config/policy-open.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
-<!ELEMENT policymap (policy)*>
-<!ATTLIST policymap xmlns CDATA #FIXED "">
-<!ELEMENT policy EMPTY>
-<!ATTLIST policy xmlns CDATA #FIXED "">
-<!ATTLIST policy domain NMTOKEN #REQUIRED>
-<!ATTLIST policy name NMTOKEN #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy rights NMTOKEN #IMPLIED>
-<!ATTLIST policy stealth NMTOKEN #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+ <!ELEMENT policymap (policy)*>
+ <!ATTLIST policymap xmlns CDATA #FIXED "">
+ <!ELEMENT policy EMPTY>
+ <!ATTLIST policy xmlns CDATA #FIXED "">
+ <!ATTLIST policy domain NMTOKEN #REQUIRED>
+ <!ATTLIST policy name NMTOKEN #IMPLIED>
+ <!ATTLIST policy pattern CDATA #IMPLIED>
+ <!ATTLIST policy rights NMTOKEN #IMPLIED>
+ <!ATTLIST policy stealth NMTOKEN #IMPLIED>
+ <!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Creating a security policy that fits your specific local environment
diff --git a/config/policy-secure.xml b/config/policy-secure.xml
index 955bba94c..ba6c797bc 100644
--- a/config/policy-secure.xml
+++ b/config/policy-secure.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
-<!ELEMENT policymap (policy)*>
-<!ATTLIST policymap xmlns CDATA #FIXED "">
-<!ELEMENT policy EMPTY>
-<!ATTLIST policy xmlns CDATA #FIXED "">
-<!ATTLIST policy domain NMTOKEN #REQUIRED>
-<!ATTLIST policy name NMTOKEN #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy rights NMTOKEN #IMPLIED>
-<!ATTLIST policy stealth NMTOKEN #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+ <!ELEMENT policymap (policy)*>
+ <!ATTLIST policymap xmlns CDATA #FIXED "">
+ <!ELEMENT policy EMPTY>
+ <!ATTLIST policy xmlns CDATA #FIXED "">
+ <!ATTLIST policy domain NMTOKEN #REQUIRED>
+ <!ATTLIST policy name NMTOKEN #IMPLIED>
+ <!ATTLIST policy pattern CDATA #IMPLIED>
+ <!ATTLIST policy rights NMTOKEN #IMPLIED>
+ <!ATTLIST policy stealth NMTOKEN #IMPLIED>
+ <!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Creating a security policy that fits your specific local environment
diff --git a/config/policy-websafe.xml b/config/policy-websafe.xml
index d95e76308..34a6b00e2 100644
--- a/config/policy-websafe.xml
+++ b/config/policy-websafe.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
-<!ELEMENT policymap (policy)*>
-<!ATTLIST policymap xmlns CDATA #FIXED "">
-<!ELEMENT policy EMPTY>
-<!ATTLIST policy xmlns CDATA #FIXED "">
-<!ATTLIST policy domain NMTOKEN #REQUIRED>
-<!ATTLIST policy name NMTOKEN #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy rights NMTOKEN #IMPLIED>
-<!ATTLIST policy stealth NMTOKEN #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+ <!ELEMENT policymap (policy)*>
+ <!ATTLIST policymap xmlns CDATA #FIXED "">
+ <!ELEMENT policy EMPTY>
+ <!ATTLIST policy xmlns CDATA #FIXED "">
+ <!ATTLIST policy domain NMTOKEN #REQUIRED>
+ <!ATTLIST policy name NMTOKEN #IMPLIED>
+ <!ATTLIST policy pattern CDATA #IMPLIED>
+ <!ATTLIST policy rights NMTOKEN #IMPLIED>
+ <!ATTLIST policy stealth NMTOKEN #IMPLIED>
+ <!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Creating a security policy that fits your specific local environment