From 609aeee3a33f595986316f911829a58733cc9bda Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 7 Dec 2023 10:05:23 +0100
Subject: refresh

---
 php-cve-2023-3824.patch | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'php-cve-2023-3824.patch')

diff --git a/php-cve-2023-3824.patch b/php-cve-2023-3824.patch
index 4a58ac4..9b8b9c4 100644
--- a/php-cve-2023-3824.patch
+++ b/php-cve-2023-3824.patch
@@ -45,7 +45,7 @@ diff --git a/ext/dom/document.c b/ext/dom/document.c
 index e683eb8f701..989b5b3dd24 100644
 --- a/ext/dom/document.c
 +++ b/ext/dom/document.c
-@@ -1458,6 +1458,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
+@@ -1459,6 +1459,7 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
  		options |= XML_PARSE_NOBLANKS;
  	}
  
@@ -53,7 +53,7 @@ index e683eb8f701..989b5b3dd24 100644
  	xmlCtxtUseOptions(ctxt, options);
  
  	ctxt->recovery = recover;
-@@ -1758,7 +1759,9 @@ PHP_FUNCTION(dom_document_xinclude)
+@@ -1759,7 +1760,9 @@ PHP_FUNCTION(dom_document_xinclude)
  
  	DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
  
@@ -63,7 +63,7 @@ index e683eb8f701..989b5b3dd24 100644
  
  	/* XML_XINCLUDE_START and XML_XINCLUDE_END nodes need to be removed as these
  	are added via xmlXIncludeProcess to mark beginning and ending of xincluded document
-@@ -1798,6 +1801,7 @@ PHP_FUNCTION(dom_document_validate)
+@@ -1799,6 +1802,7 @@ PHP_FUNCTION(dom_document_validate)
  
  	DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
  
@@ -71,7 +71,7 @@ index e683eb8f701..989b5b3dd24 100644
  	cvp = xmlNewValidCtxt();
  
  	cvp->userData = NULL;
-@@ -1809,6 +1813,7 @@ PHP_FUNCTION(dom_document_validate)
+@@ -1810,6 +1814,7 @@ PHP_FUNCTION(dom_document_validate)
  	} else {
  		RETVAL_FALSE;
  	}
@@ -79,7 +79,7 @@ index e683eb8f701..989b5b3dd24 100644
  
  	xmlFreeValidCtxt(cvp);
  
-@@ -1843,14 +1848,18 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
+@@ -1844,14 +1849,18 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
  
  	DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
  
@@ -98,7 +98,7 @@ index e683eb8f701..989b5b3dd24 100644
  			php_error_docref(NULL, E_WARNING, "Invalid Schema file source");
  			RETURN_FALSE;
  		}
-@@ -1871,6 +1880,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
+@@ -1872,6 +1881,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
  		parser);
  	sptr = xmlSchemaParse(parser);
  	xmlSchemaFreeParserCtxt(parser);
@@ -106,7 +106,7 @@ index e683eb8f701..989b5b3dd24 100644
  	if (!sptr) {
  		php_error_docref(NULL, E_WARNING, "Invalid Schema");
  		RETURN_FALSE;
-@@ -1889,11 +1899,13 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
+@@ -1890,11 +1900,13 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
  		valid_opts |= XML_SCHEMA_VAL_VC_I_CREATE;
  	}
  
@@ -120,7 +120,7 @@ index e683eb8f701..989b5b3dd24 100644
  
  	if (is_valid == 0) {
  		RETURN_TRUE;
-@@ -1964,12 +1976,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
+@@ -1965,12 +1977,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
  		return;
  	}
  
@@ -135,7 +135,7 @@ index e683eb8f701..989b5b3dd24 100644
  	if (!sptr) {
  		php_error_docref(NULL, E_WARNING, "Invalid RelaxNG");
  		RETURN_FALSE;
-@@ -2068,6 +2082,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
+@@ -2069,6 +2083,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
  		ctxt->sax->error = php_libxml_ctx_error;
  		ctxt->sax->warning = php_libxml_ctx_warning;
  	}
@@ -203,7 +203,7 @@ diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
 index cf936e95de1..92028d5703e 100644
 --- a/ext/libxml/php_libxml.h
 +++ b/ext/libxml/php_libxml.h
-@@ -120,6 +120,42 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
+@@ -121,6 +121,42 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
  ZEND_TSRMLS_CACHE_EXTERN()
  #endif
  
-- 
cgit