Nikita Popov
f116a88592
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-23 12:21:16 +02:00
Christoph M. Becker
418da85f15
Fix #71606 : Segmentation fault mb_strcut with HTML-ENTITIES
...
The HTML decoding filter uses the `opaque` member of mbfl_convert_filter
as buffer, but there was no copy constructor defined, what caused double
frees when the filter is copied (what happens multiple times in mb_strcut(),
for instance).
2017-07-23 12:19:27 +02:00
Remi Collet
bee52f352f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
NEWS
Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229) b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226) b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6 f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
2017-05-30 15:45:52 +02:00
Remi Collet
1c845d2950
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:40:32 +02:00
Remi Collet
5416deec66
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:39:21 +02:00
Remi Collet
6a8ae7cf8d
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:38:17 +02:00
Remi Collet
60b1829e1c
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:37:11 +02:00
Remi Collet
1e0c4386ab
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:35:42 +02:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Anatol Belski
f86e077ec8
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix C89 compat
2016-12-17 20:46:09 +01:00
Anatol Belski
58a945cf68
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix C89 compat
2016-12-17 20:45:22 +01:00
Anatol Belski
79e47aae41
fix C89 compat
2016-12-17 20:43:32 +01:00
Xinchen Hui
6a43c61bcd
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)
2016-12-09 15:55:07 +08:00
Stanislav Malyshev
bc85678df3
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:49:48 -08:00
Stanislav Malyshev
dd7eee0609
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:48:50 -08:00
Stanislav Malyshev
58cdd03d92
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:48:40 -08:00
Stanislav Malyshev
5ee02b207d
Add more mbfl string size checks (bug #73505 )
2016-11-26 14:47:58 -08:00
Anatol Belski
d61db8d602
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
remove TSRMLS_*
2016-11-22 00:32:42 +01:00
Anatol Belski
5e9b4c26a5
remove TSRMLS_*
2016-11-21 23:53:37 +01:00
Dmitry Stogov
a56bba14e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:34:32 +03:00
Dmitry Stogov
a67637039f
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:33:05 +03:00
Xinchen Hui
229024c725
Fixed bug #73532 (Null pointer dereference in mb_eregi)
2016-11-16 15:05:04 +08:00
Stanislav Malyshev
e1709b7e58
Fix bug #73082
2016-09-25 16:07:14 -07:00
Yasuo Ohgaki
8c700076d7
Fix bug26639.phpt
2016-09-08 14:07:57 +09:00
Yasuo Ohgaki
1ecf361c15
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
2016-09-08 13:32:47 +09:00
Yasuo Ohgaki
379d9a1cfc
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
2016-09-08 13:32:31 +09:00
Yasuo Ohgaki
8bbd0952e5
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
2016-09-08 13:17:10 +09:00
Christoph M. Becker
68d3501381
Merge branch 'pull-request/2115' into PHP-7.1
2016-09-06 14:14:23 +02:00
Yasuo Ohgaki
012232b9a4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
2016-09-06 16:42:07 +09:00
Yasuo Ohgaki
6f1a52bfbb
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
2016-09-06 16:41:52 +09:00
Yasuo Ohgaki
a25f6f89cd
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
2016-09-06 16:05:34 +09:00
Stanislav Malyshev
3bfd06061e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Sync fix for bug #72910 with current upstream
2016-09-04 19:15:45 -07:00
Stanislav Malyshev
c3dfe57c23
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Sync fix for bug #72910 with current upstream
2016-09-04 19:15:30 -07:00
Stanislav Malyshev
d1fbc98ff6
Sync fix for bug #72910 with current upstream
2016-09-04 19:13:48 -07:00
Christoph M. Becker
94b66b8793
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-04 16:47:55 +02:00
Christoph M. Becker
7f97d63130
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-04 16:39:45 +02:00
Christoph M. Becker
b7259b71b4
Fix #72994 : mbc_to_code() out of bounds read
...
We're backporting commit 999a3553
to the still supported PHP 5.6.
2016-09-04 16:37:06 +02:00
Christoph M. Becker
727b422ad9
Fix #72948 : Uncatchable "Catchable" fatal error for class to string conversions
...
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
2016-09-03 13:05:37 +02:00
Stanislav Malyshev
01f4a52aaa
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #72910
5.6.27 will be next
2016-09-01 23:29:17 -07:00
Stanislav Malyshev
ccc8d92d3d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #72910
5.6.27 will be next
2016-09-01 23:28:44 -07:00
Stanislav Malyshev
e576714f6b
Fix bug #72910
...
Merge upstream patch from 65bdf2a0d1
2016-09-01 23:27:06 -07:00
Christoph M. Becker
ecdef60d00
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 15:12:49 +02:00
Christoph M. Becker
972302d2f0
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 15:01:12 +02:00
Christoph M. Becker
2f10db36af
Fix #66797 : mb_substr only takes 32-bit signed integer
...
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
2016-08-30 14:52:47 +02:00
ju1ius
03d03243fa
Fix #72711 : mb_ereg
does not clear the $regs
parameter on failure
...
When `mb_ereg` failed to match, it didn't update the `$regs` argument.
Now it will always set it to the empty array.
2016-08-05 13:22:10 +02:00
Christoph M. Becker
9c2814313d
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-30 12:04:12 +02:00
Christoph M. Becker
e5940aa795
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-30 12:01:29 +02:00
ju1ius
1d32b80903
fixes bad address given to onig_error_code_to_str
...
Closes bug #72710
(cherry picked from commit 0fb7eb6723
)
2016-07-30 11:46:34 +02:00
Christoph M. Becker
de755310b4
Merge branch 'PHP-7.0' into PHP-7.1
...
# Resolved conflicts:
# ext/mbstring/php_mbregex.c
2016-07-28 15:50:41 +02:00