310b95d7eb
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Add support for getting SKIP_TAGSTART and SKIP_WHITE options
2018-10-16 18:49:17 +02:00
b33124239a
Add support for getting SKIP_TAGSTART and SKIP_WHITE options
...
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 >
2018-10-16 18:47:31 +02:00
902d39a3a7
Trim trailing whitespace in source code files
2018-10-13 14:14:50 +02:00
7f6387b59a
Trim trailing whitespace in source code files
2018-10-13 14:12:55 +02:00
ebecf569f9
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #30875 : xml_parse_into_struct() does not resolve entities
2018-10-09 16:06:56 +02:00
2845f859c1
Fix #30875 : xml_parse_into_struct() does not resolve entities
...
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 >
2018-10-09 16:04:43 +02:00
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
bfb9be9bd4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
remove TSRMLS_*
2016-11-22 00:33:29 +01:00
d61db8d602
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
remove TSRMLS_*
2016-11-22 00:32:42 +01:00
5e9b4c26a5
remove TSRMLS_*
2016-11-21 23:53:37 +01:00
1a512eed44
Move utf8_encode and utf8_decode to ext/standard
2016-10-17 15:39:02 +01:00
9988863d37
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-20 12:50:48 +02:00
39172d44d8
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-20 12:46:08 +02:00
52793c14d9
Improvements to fix #72714 , suggested by nikic
2016-08-20 12:44:20 +02:00
76c796fb27
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-20 02:28:18 +02:00
db1ef5cb00
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-20 02:14:49 +02:00
9164dc11e2
Fix #72714 : _xml_startElementHandler() segmentation fault
...
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.
2016-08-20 01:58:08 +02:00
f3231a7c76
Unused var
2016-08-17 11:16:48 +08:00
1d24ac46ab
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-17 01:23:22 +02:00
6202b47e63
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-17 01:22:11 +02:00
1bb92d5212
#72085 : SEGV on unknown address zif_xml_parse
...
We better make sure that the ZVALs we're accessing as arrays are indeed
arrays.
2016-08-17 00:42:45 +02:00
0ac5144836
Fix bug #72099 : xml_parse_into_struct segmentation fault
2016-06-28 01:23:24 -07:00
adc95c5114
Fixed compilation warnings
2016-06-23 12:47:06 +03:00
8c41df5480
Unused var
2016-06-14 21:29:02 +08:00
4a42fbbbc7
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
2016-05-14 08:11:18 +01:00
b165114013
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
2016-05-14 08:10:16 +01:00
f0a2e8eb13
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
2016-04-27 13:46:38 +03:00
33d41da347
Merge branch 'PHP-5.6' into PHP-7.0
...
* 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
2016-04-27 11:45:29 +02:00
e315a162da
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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
2016-04-26 23:48:41 -07:00
dccda88f27
Fix bug #72099 : xml_parse_into_struct segmentation fault
2016-04-26 22:46:28 -07:00
f57c0b3249
Merge branch 'PHP-7.0'
2016-03-03 16:50:47 +01:00
1ac152938c
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
...
Also re bug #71575 .
2016-03-03 16:50:01 +01:00
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03:00
2e874114a2
Merge branch 'PHP-7.0'
...
* 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
...
2016-03-01 23:11:42 -08:00
57b997ebf9
Fix bug #71637 : Multiple Heap Overflow due to integer overflows
2016-02-21 23:14:29 -08:00
93dc91b386
Remove version checks
...
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2
I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
3d5438bf7b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update header to PHP Version 7
Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
145b68c834
Merge branch 'PHP-7.0'
2015-12-12 22:52:51 -08:00
4171a8f6c6
Internal function argumensts cleanup (strict_types)
2015-12-12 22:52:37 -08:00
fc2cedfb1d
Make 2nd arg of xml_set_object by value
...
The argument is not being modified. Probably holdover from PHP 4
days.
2015-12-10 23:35:25 +01:00
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
663074b6b1
cleanup mod version macros and mod defs, round x
2015-03-23 21:30:22 +01:00
ffabfc703d
fix exports
2015-03-23 15:09:06 +01:00
d146d15003
Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate()
2015-03-20 02:02:42 +03:00
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Christoph M. Becker