archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source
This commit is contained in:
Derick Rethans 2023-07-31 19:57:02 +01:00
commit 86afbe10e2
16 changed files with 273 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/xmlreader/php_xmlreader.c
View file

@ -283,6 +283,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
return NULL;
}
PHP_LIBXML_SANITIZE_GLOBALS(parse);
if (error_func || warn_func) {
xmlRelaxNGSetParserErrors(parser,
(xmlRelaxNGValidityErrorFunc) error_func,
@ -291,6 +292,7 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, size_t source_len, siz
}
sptr = xmlRelaxNGParse(parser);
xmlRelaxNGFreeParserCtxt(parser);
PHP_LIBXML_RESTORE_GLOBALS(parse);
return sptr;
}
@ -865,7 +867,9 @@ PHP_METHOD(XMLReader, open)
valid_file = _xmlreader_get_valid_file_path(source, resolved_path, MAXPATHLEN );
if (valid_file) {
PHP_LIBXML_SANITIZE_GLOBALS(reader_for_file);
reader = xmlReaderForFile(valid_file, encoding, options);
PHP_LIBXML_RESTORE_GLOBALS(reader_for_file);
}
if (reader == NULL) {
@ -937,8 +941,10 @@ PHP_METHOD(XMLReader, setSchema)
id = ZEND_THIS;
intern = Z_XMLREADER_P(id);
if (intern->ptr) {
if (intern && intern->ptr) {
PHP_LIBXML_SANITIZE_GLOBALS(schema);
retval = xmlTextReaderSchemaValidate(intern->ptr, source);
PHP_LIBXML_RESTORE_GLOBALS(schema);
if (retval == 0) {
RETURN_TRUE;
@ -1059,6 +1065,7 @@ PHP_METHOD(XMLReader, XML)
}
uri = (char *) xmlCanonicPath((const xmlChar *) resolved_path);
}
PHP_LIBXML_SANITIZE_GLOBALS(text_reader);
reader = xmlNewTextReader(inputbfr, uri);
if (reader != NULL) {
@ -1077,9 +1084,11 @@ PHP_METHOD(XMLReader, XML)
xmlFree(uri);
}
PHP_LIBXML_RESTORE_GLOBALS(text_reader);
return;
}
}
PHP_LIBXML_RESTORE_GLOBALS(text_reader);
}
if (uri) {