Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Anatol Belski
1b29dc0b1c
Fix yet one data race in PCRE
...
PCRE 8.x initializes the pattern compiler on demand during the first
pcre_study call. It could be worse, but since the compiled patterns are
cached, the locking impact is minimal. PCRE 10.x always compiles the
pattern and thread sanitizer doesn't complain about the compiler
initialization, thus the newer PCRE version seems to be unafected.
2017-12-06 15:59:21 +01:00
Anatol Belski
092fd44474
Fix use after free revealed by phpdbg
2017-12-05 18:32:32 +01:00
Anatol Belski
31b2b14a71
Fixed bug #75601 Thread race in PCRE JIT support
2017-12-05 17:38:18 +01:00
Anatol Belski
f5c0754f6e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #75539 and #74183 - preg_last_error not returning error code after error
2017-11-21 20:10:49 +01:00
Nester
8fdef981ef
Fixed #75539 and #74183 - preg_last_error not returning error code after error
2017-11-21 20:10:18 +01:00
Anatol Belski
db9778dfb2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Apply upstream patch for CVE-2016-1283
2017-09-28 15:44:40 +02:00
Anatol Belski
d11fceab15
Apply upstream patch for CVE-2016-1283
...
Fix bug #75207 , see also
https://bugzilla.redhat.com/show_bug.cgi?id=1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
2017-09-28 15:40:49 +02:00
Stanislav Malyshev
0ba04f7737
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Improve fix for #74145
Fix wddx
Fix tests
Fixed bug #74111
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #74087
Fixed parsing of strange formats with mixed month/day and time strings
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Fixed bug #74111
Fix #74435 : Buffer over-read into uninitialized memory
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #73807
2017-07-04 21:18:10 -07:00
Stanislav Malyshev
0496f5407f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Update NEWS
Fix bug #74087
Fixed parsing of strange formats with mixed month/day and time strings
Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
Fixed bug #74111
Fix #74435 : Buffer over-read into uninitialized memory
Fix bug #74603 - use correct buffer size
Fix bug #74651 - check EVP_SealInit as it can return -1
Update NEWS
Fix bug #73807
2017-07-04 19:44:51 -07:00
Stanislav Malyshev
f7f4fd4706
Fix bug #74087
...
Ported from https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
2017-07-04 19:21:28 -07:00
Anatol Belski
f7bb3b5cbd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
2017-01-07 02:05:37 +01:00
Mitch Hagstrand
4568618030
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
...
This reverts commit e55e93a1e3
.
This change should only apply to master. Not PHP-7.0 or PHP-7.1
2017-01-07 02:04:03 +01:00
Joe Watkins
c50f61b9b0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Test request47456.phpt for PR 1303
2017-01-06 16:22:58 +00:00
Mitch Hagstrand
e55e93a1e3
Test request47456.phpt for PR 1303
...
After merging PR 1303 unmatched subpatterns are set to NULL
2017-01-06 16:22:11 +00: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
Christoph M. Becker
09085ac02c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-26 16:09:45 +01:00
Christoph M. Becker
003727d851
Fix #73612 : preg_*() may leak memory
...
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
2016-11-26 15:34:27 +01:00
Xinchen Hui
0f5d03025f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
Fix #73219 (fix acinclude when / is present)
make it possible to show specific help pages without interactive session
Conflicts:
acinclude.m4
2016-11-20 15:46:53 +08:00
Xinchen Hui
ebfd93f725
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
2016-11-20 15:44:27 +08:00
Xinchen Hui
6b671ca3ed
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Skip if no jit is built
2016-10-29 14:23:47 +08:00
Xinchen Hui
66caa61188
Skip if no jit is built
2016-10-29 14:23:25 +08:00
Xinchen Hui
7778bdcd04
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73392 (A use-after-free in zend allocator management)
2016-10-28 21:21:35 +08:00
Xinchen Hui
e5aa365147
Fixed bug #73392 (A use-after-free in zend allocator management)
2016-10-28 21:21:24 +08:00
Nikita Popov
b1fc1fb937
Normalize preg_replace_callback() return value
...
One particular error case was returning the argument without
casting to string.
2016-10-15 23:58:26 +02:00
Anatol Belski
dd604015be
rename publicly exposed symbol to avoid name conflicts
...
(cherry picked from commit 730288ae41
)
2016-10-14 02:08:14 +02:00
Stanislav Malyshev
0362d61ab7
Fix potential overflows in php_pcre_replace_impl
...
(cherry picked from commit 9c50ba42d6
)
2016-10-14 01:57:55 +02:00
Anatol Belski
730288ae41
rename publicly exposed symbol to avoid name conflicts
2016-10-13 15:23:50 +02:00
Stanislav Malyshev
9c50ba42d6
Fix potential overflows in php_pcre_replace_impl
2016-10-12 23:07:47 -07:00
Stanislav Malyshev
29e2a204fb
Fixed bug #73174 - heap overflow in php_pcre_replace_impl
2016-09-28 22:29:59 -07:00
Anatol Belski
f7e5481a10
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
2016-09-23 01:55:17 +02:00
Anatol Belski
54d8053ac5
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
2016-09-23 01:52:42 +02:00
Stanislav Malyshev
19866fb76c
Fix various int size overflows.
...
Add function for detection of string zvals with length that does not fit
INT_MAX.
2016-09-12 21:04:23 -07:00
Andrea Faulds
fc5497cb92
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-11 22:46:20 +01:00
Andrea Faulds
d690014bf3
Remove zpp fallback code (always use Fast ZPP)
...
Squashed commit of the following:
commit 3e27fbb3d2
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100
Keep dummy FAST_ZPP macro for compatibility
commit 8a7cfd00de
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100
Remove FAST_ZPP macro and plain zpp fallback code
2016-09-11 22:44:46 +01:00
Christoph M. Becker
68d3501381
Merge branch 'pull-request/2115' into PHP-7.1
2016-09-06 14:14:23 +02:00
Stanislav Malyshev
9650b8e241
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:39:01 -07:00
Stanislav Malyshev
92db92c620
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:38:57 -07:00
Christoph M. Becker
39423e425d
Implement #47456 : Missing PCRE option 'J'
...
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).
[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php >
2016-09-05 00:30:48 -07: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
Anatol Belski
a747578497
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix possible memory leak
2016-08-29 15:29:52 +02:00
Anatol Belski
1d7ec685c1
fix possible memory leak
2016-08-29 15:28:09 +02:00
Anatol Belski
db9baae4fb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
Revert "upgraded to PCRE 8.39"
2016-07-31 15:00:18 +02:00
Anatol Belski
5f9df47ea8
Revert "upgraded to PCRE 8.39"
...
This reverts commit 2fba646837
.
PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.
2016-07-31 14:55:17 +02:00
Christoph M. Becker
15f94e93e7
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-27 19:06:36 +02:00
Christoph M. Becker
40afd77826
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/pcre/php_pcre.c
2016-07-27 19:00:38 +02:00
Christoph M. Becker
315c0536c2
Fix #72688 : preg_match missing group names in matches
...
We have to multiply with 0x100 to properly scale the high byte.
2016-07-27 18:50:52 +02:00
Anatol Belski
2fba646837
upgraded to PCRE 8.39
...
(cherry picked from commit 9d4fe9672a
)
2016-07-26 15:07:04 +02:00
Matteo Beccati
e2e72e1f5c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Rewrite test to avoid sending emails
2016-07-06 07:10:10 +02:00