From 93506d41cbf59b56d586dcc1f40d77237a8bb1ee Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Wed, 29 Jan 2025 00:17:01 +0100
Subject: [PATCH] parser: Make catalog PIs opt-in

This is an obscure feature that shouldn't be enabled by default.
---
 NEWS                    | 2 +-
 catalog.c               | 4 ++--
 include/libxml/parser.h | 2 +-
 parser.c                | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 22e05d64..14c297d4 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ existing parser context was added.
 The xmlSave API now has additional options to replace global settings.
 
 Parser options XML_PARSE_UNZIP, XML_PARSE_NO_SYS_CATALOG and
-XML_PARSE_NO_CATALOG_PI were added.
+XML_PARSE_CATALOG_PI were added.
 
 The serialization API will now take user-provided or default encodings
 into account when serializing attribute values, matching the
diff --git a/catalog.c b/catalog.c
index b1409a1b..8aaa0784 100644
--- a/catalog.c
+++ b/catalog.c
@@ -3420,7 +3420,7 @@ xmlCatalogConvert(void) {
  * xmlCatalogGetDefaults:
  *
  * DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and
- * XML_PARSE_NO_CATALOG_PI.
+ * XML_PARSE_CATALOG_PI.
  *
  * Used to get the user preference w.r.t. to what catalogs should
  * be accepted
@@ -3437,7 +3437,7 @@ xmlCatalogGetDefaults(void) {
  * @allow:  what catalogs should be accepted
  *
  * DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and
- * XML_PARSE_NO_CATALOG_PI.
+ * XML_PARSE_CATALOG_PI.
  *
  * Used to set the user preference w.r.t. to what catalogs should
  * be accepted
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 0809029f..3ca2ff5b 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -1419,7 +1419,7 @@ typedef enum {
     /* since 2.14.0 */
     XML_PARSE_UNZIP          = 1<<24,/* allow compressed content */
     XML_PARSE_NO_SYS_CATALOG = 1<<25,/* disable global system catalog */
-    XML_PARSE_NO_CATALOG_PI  = 1<<26 /* ignore catalog PIs */
+    XML_PARSE_CATALOG_PI     = 1<<26 /* allow catalog PIs */
 } xmlParserOption;
 
 XMLPUBFUN void
diff --git a/parser.c b/parser.c
index 30c00fcd..52199988 100644
--- a/parser.c
+++ b/parser.c
@@ -5676,7 +5676,7 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
 		    (xmlStrEqual(target, XML_CATALOG_PI))) {
 		    xmlCatalogAllow allow = xmlCatalogGetDefaults();
 
-		    if (((ctxt->options & XML_PARSE_NO_CATALOG_PI) == 0) &&
+		    if ((ctxt->options & XML_PARSE_CATALOG_PI) &&
                         ((allow == XML_CATA_ALLOW_DOCUMENT) ||
 			 (allow == XML_CATA_ALLOW_ALL)))
 			xmlParseCatalogPI(ctxt, buf);
@@ -13580,7 +13580,7 @@ xmlCtxtSetOptionsInternal(xmlParserCtxtPtr ctxt, int options, int keepMask)
               XML_PARSE_NO_XXE |
               XML_PARSE_UNZIP |
               XML_PARSE_NO_SYS_CATALOG |
-              XML_PARSE_NO_CATALOG_PI;
+              XML_PARSE_CATALOG_PI;
 
     ctxt->options = (ctxt->options & keepMask) | (options & allMask);
 
@@ -13788,9 +13788,9 @@ xmlCtxtSetOptionsInternal(xmlParserCtxtPtr ctxt, int options, int keepMask)
  *
  * Available since 2.14.0.
  *
- * XML_PARSE_NO_CATALOG_PI
+ * XML_PARSE_CATALOG_PI
  *
- * Ignore XML catalog processing instructions.
+ * Enable XML catalog processing instructions.
  *
  * Available since 2.14.0.
  *