Skip to content

Move away from to-be-deprecated libxml fields #14836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Move away from to-be-deprecated libxml fields #14836

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0e8d07
Port XML_GetCurrentByteIndex to public APIs
nielsdos Jul 5, 2024
9c9dc5e
Stop relying on the sax2 flag directly
nielsdos Jul 5, 2024
1eb942b
Stop relying on lastError directly
nielsdos Jul 5, 2024
fc5a6b2
Stop setting parse options directly
nielsdos Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions ext/xml/compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,13 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
}

php_libxml_sanitize_parse_ctxt_options(parser->parser);
xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX);
xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);

parser->parser->replaceEntities = 1;
parser->parser->wellFormed = 0;
if (sep != NULL) {
/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */
ZEND_ASSERT(parser->parser->sax->initialized == XML_SAX2_MAGIC);
parser->use_namespace = 1;
parser->parser->sax2 = 1;
parser->_ns_separator = xmlStrdup(sep);
} else {
/* Reset flag as XML_SAX2_MAGIC is needed for xmlCreatePushParserCtxt
Expand Down Expand Up @@ -563,10 +563,14 @@ XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler en
PHP_XML_API int
XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
{
int error;
int error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);

error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
return !error && parser->parser->lastError.level <= XML_ERR_WARNING;
if (!error) {
const xmlError *error_data = xmlCtxtGetLastError(parser->parser);
return !error_data || error_data->level <= XML_ERR_WARNING;
}

return 0;
}

PHP_XML_API int
Expand Down Expand Up @@ -705,8 +709,21 @@ XML_GetCurrentColumnNumber(XML_Parser parser)
PHP_XML_API int
XML_GetCurrentByteIndex(XML_Parser parser)
{
return parser->parser->input->consumed +
(parser->parser->input->cur - parser->parser->input->base);
/* We have to temporarily disable the encoder to satisfy the note from the manual:
* "This function returns byte index according to UTF-8 encoded text disregarding if input is in another encoding."
* Although that should probably be corrected at one point? (TODO) */
xmlCharEncodingHandlerPtr encoder = NULL;
xmlParserInputPtr input = parser->parser->input;
if (input->buf) {
encoder = input->buf->encoder;
input->buf->encoder = NULL;
}
long result = xmlByteConsumed(parser->parser);
if (encoder) {
input->buf->encoder = encoder;
}
/* TODO: at one point this should return long probably to make sure that files greater than 2 GiB are handled correctly. */
return (int) result;
}

PHP_XML_API int
Expand Down
Loading