summaryrefslogtreecommitdiff
path: root/ext/xml/xml.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-10-161-0/+6
|\ | | | | | | | | * PHP-7.2: Add support for getting SKIP_TAGSTART and SKIP_WHITE options
| * Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-10-161-0/+6
| |\ | | | | | | | | | | | | * PHP-7.1: Add support for getting SKIP_TAGSTART and SKIP_WHITE options
| | * Add support for getting SKIP_TAGSTART and SKIP_WHITE optionsChristoph M. Becker2018-10-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | When `XML_OPTION_SKIP_TAGSTART` and `XML_OPTION_SKIP_WHITE` had been introduced[1], it had been overlooked to also support them for `xml_parser_get_option()`. We catch up on that. [1] <http://git.php.net/?p=php-src.git;a=commit;h=b57dc275950b228f2399990471c4f22b7d154c6c>
| | * Trim trailing whitespace in source code filesPeter Kokot2018-10-131-45/+45
| | |
| * | Trim trailing whitespace in source code filesPeter Kokot2018-10-131-43/+43
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-10-091-1/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #30875: xml_parse_into_struct() does not resolve entities
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-10-091-1/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #30875: xml_parse_into_struct() does not resolve entities
| | * Fix #30875: xml_parse_into_struct() does not resolve entitiesChristoph M. Becker2018-10-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up an empty default handler is not only useless, but actually harmful, since internal entity-references are not resolved anymore. From the libexpat docs[1]: | Setting the handler with this call has the side effect of | turning off expansion of references to internally defined general | entities. Instead these references are passed to the default | handler. [1] <https://www.xml.com/pub/1999/09/expat/reference.html#setdefhandler>
| | * year++Xinchen Hui2018-01-021-1/+1
| | |
| | * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| | |
| * | year++Xinchen Hui2018-01-021-1/+1
| | |
* | | Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* | | Use zend_string_release_ex() instread of zend_string_release() in places, ↵Dmitry Stogov2018-05-281-7/+7
| | | | | | | | | | | | where we sure about string persistence.
* | | Reduce variable scopeAnatol Belski2018-02-171-2/+1
| | |
* | | Trailing whitespacesGabriel Caruso2018-01-031-43/+43
| | | | | | | | | | | | Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
* | | year++Xinchen Hui2018-01-021-1/+1
| | |
* | | Move constants into read-only data segmentDmitry Stogov2017-12-141-6/+6
| | |
* | | Move constants into read-only data segmentDmitry Stogov2017-12-141-1/+1
| | |
* | | Cleanup type conversionDmitry Stogov2017-12-071-6/+3
| | |
* | | Kill compiler warnings in ext/xmlKalle Sommer Nielsen2017-08-241-1/+1
|/ /
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-2/+2
| |
* | Merge branch 'PHP-7.1'Anatol Belski2016-11-221-1/+1
|\ \ | |/ | | | | | | * PHP-7.1: remove TSRMLS_*
| * Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-1/+1
| |\ | | | | | | | | | | | | * PHP-7.0: remove TSRMLS_*
| | * remove TSRMLS_*Anatol Belski2016-11-211-1/+1
| | |
* | | Move utf8_encode and utf8_decode to ext/standardAndrea Faulds2016-10-171-50/+0
|/ /
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-201-2/+2
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-201-2/+2
| |\
| | * Improvements to fix #72714, suggested by nikicChristoph M. Becker2016-08-201-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-201-6/+14
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-201-6/+14
| |\ \ | | |/
| | * Fix #72714: _xml_startElementHandler() segmentation faultChristoph M. Becker2016-08-201-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is caused by an integer overflow when the `long` passed as XML_OPTION_SKIP_TAGSTART is assigned to `xml_parser::toffset` which is declared as `int`. We can simply work around this issue, by clipping resulting negative values to 0 (and raising a notice in this case), because the reasonable range for this value is certainly catered to by positive `int`s. However, there still remains the issue that `xml_parser::toffset` is later added to `char *`s, which can cause OOB reads, so we make sure that the upper bound never exceeds the strlen(). We eschew optimizing `SKIP_TAGSTART` wrt. to the potentially duplicate strlen() call, because that code path is unexpected anyway.
| * | Unused varXinchen Hui2016-08-171-1/+0
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-171-1/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-171-1/+2
| |\ \ | | |/
| | * #72085: SEGV on unknown address zif_xml_parseChristoph M. Becker2016-08-171-1/+2
| | | | | | | | | | | | | | | We better make sure that the ZVALs we're accessing as arrays are indeed arrays.
| * | fix #72206 (xml_parser_create/xml_parser_free leaks mem)Joe Watkins2016-05-141-3/+4
| | |
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-04-271-30/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix memory leak Fix bug #72099: xml_parse_into_struct segmentation fault 5.5.36 now Fix bug #72094 - Out of bounds heap read access in exif header processing Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset Fix for bug #71912 (libgd: signedness vulnerability) Typo in NEWS
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-04-261-53/+53
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix memory leak Fix bug #72099: xml_parse_into_struct segmentation fault 5.5.36 now Fix bug #72094 - Out of bounds heap read access in exif header processing Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset Fix for bug #71912 (libgd: signedness vulnerability) Typo in NEWS Conflicts: configure.in main/php_version.h
| | | * Fix bug #72099: xml_parse_into_struct segmentation faultStanislav Malyshev2016-04-261-53/+53
| | | |
| | | * Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | Fix bug #72099: xml_parse_into_struct segmentation faultStanislav Malyshev2016-06-281-1/+1
| | | |
* | | | Fixed compilation warningsDmitry Stogov2016-06-231-2/+2
| | | |
* | | | Unused varXinchen Hui2016-06-141-1/+0
| | | |
* | | | fix #72206 (xml_parser_create/xml_parser_free leaks mem)Joe Watkins2016-05-141-3/+4
| | | |
* | | | Removed "zend_fcall_info.function_table". It was assigned in many places, ↵Dmitry Stogov2016-04-271-1/+0
| | | | | | | | | | | | | | | | but is never used.
* | | | Merge branch 'PHP-7.0'Nikita Popov2016-03-031-1/+1
|\ \ \ \ | |/ / /
| * | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | | | | | | | | | | | | | Also re bug #71575.
* | | | Removed zend_fcall_info.symbol_tableDmitry Stogov2016-03-021-1/+0
| | | |
* | | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-03-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (25 commits) Update NEWS update NEWS fix test file Fix version update NEWS Update NEWS Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() Fix bug #71637: Multiple Heap Overflow due to integer overflows extend check for add_flag Fixed another segfault with file_cache_only now set version fix nmake clean in phpize mode Fixed segfault with file_cache_only Fixed possible crash at PCRE on MSHUTDOWN Fixed more synchronisation issues during SHM reload Set proper type flags (REFCOUNTED and COPYABLE) according to interned or regular string sync with improvements in NEWS Fixed process synchronisation problem, that may cause crashes after opcache restart Fix bug #71610: Type Confusion Vulnerability - SOAP / make_http_soap_request() Fix bug #71637: Multiple Heap Overflow due to integer overflows ...