php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available

Browse Source 
To do this, we move the macro check and therefore we also have to move
some variable declarations to avoid compiler warnings.

Closes GH-20130.
This commit is contained in:
Niels Dossche
2025-10-11 11:52:39 +02:00
parent ab9d121f48
commit 40f4091256
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -18,6 +18,10 @@ PHP NEWS
- Random:
. Fix Randomizer::__serialize() w.r.t. INDIRECTs. (nielsdos)
- XMLReader:
. Fix arginfo/zpp violations when LIBXML_SCHEMAS_ENABLED is not available.
(nielsdos)
23 Oct 2025, PHP 8.3.27
- Core:

28
ext/xmlreader/php_xmlreader.c
View File

@@ -468,12 +468,7 @@ static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_
/* {{{ php_xmlreader_set_relaxng_schema */
static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int type) {
#ifdef LIBXML_SCHEMAS_ENABLED
zval *id;
size_t source_len = 0;
int retval = -1;
xmlreader_object *intern;
xmlRelaxNGPtr schema = NULL;
char *source;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p!", &source, &source_len) == FAILURE) {
@@ -484,11 +479,13 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
zend_argument_value_error(1, "cannot be empty");
RETURN_THROWS();
}
id = ZEND_THIS;
intern = Z_XMLREADER_P(id);
#ifdef LIBXML_SCHEMAS_ENABLED
xmlreader_object *intern = Z_XMLREADER_P(ZEND_THIS);
if (intern->ptr) {
int retval = -1;
xmlRelaxNGPtr schema = NULL;
if (source) {
schema = _xmlreader_get_relaxNG(source, source_len, type, NULL, NULL);
if (schema) {
@@ -926,11 +923,7 @@ PHP_METHOD(XMLReader, readString)
/* {{{ Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). */
PHP_METHOD(XMLReader, setSchema)
{
#ifdef LIBXML_SCHEMAS_ENABLED
zval *id;
size_t source_len = 0;
int retval = -1;
xmlreader_object *intern;
char *source;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p!", &source, &source_len) == FAILURE) {
@@ -941,13 +934,12 @@ PHP_METHOD(XMLReader, setSchema)
zend_argument_value_error(1, "cannot be empty");
RETURN_THROWS();
}
id = ZEND_THIS;
intern = Z_XMLREADER_P(id);
#ifdef LIBXML_SCHEMAS_ENABLED
xmlreader_object *intern = Z_XMLREADER_P(ZEND_THIS);
if (intern && intern->ptr) {
PHP_LIBXML_SANITIZE_GLOBALS(schema);
retval = xmlTextReaderSchemaValidate(intern->ptr, source);
int retval = xmlTextReaderSchemaValidate(intern->ptr, source);
PHP_LIBXML_RESTORE_GLOBALS(schema);
if (retval == 0) {