summaryrefslogtreecommitdiff
path: root/ext/pcre
Commit message (Collapse)AuthorAgeFilesLines
* year++Xinchen Hui2018-01-022-2/+2
|
* Fix yet one data race in PCREAnatol Belski2017-12-061-1/+3
| | | | | | | | 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.
* Fix use after free revealed by phpdbgAnatol Belski2017-12-051-1/+1
|
* Fixed bug #75601 Thread race in PCRE JIT supportAnatol Belski2017-12-051-0/+18
|
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-11-213-0/+36
|\ | | | | | | | | * PHP-7.0: Fixed #75539 and #74183 - preg_last_error not returning error code after error
| * Fixed #75539 and #74183 - preg_last_error not returning error code after errorNester2017-11-213-0/+36
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-09-282-1/+16
|\ \ | |/ | | | | | | * PHP-7.0: Apply upstream patch for CVE-2016-1283
| * Apply upstream patch for CVE-2016-1283Anatol Belski2017-09-282-1/+16
| | | | | | | | | | | | Fix bug #75207, see also https://bugzilla.redhat.com/show_bug.cgi?id=1295385 https://vcs.pcre.org/pcre?view=revision&revision=1636
* | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-07-041-1/+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
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2017-07-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Fix bug #74087Stanislav Malyshev2017-07-041-1/+1
| | | | | | | | | | | | Ported from https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
| | * Fixed bug #73174 - heap overflow in php_pcre_replace_implStanislav Malyshev2016-09-281-8/+14
| | |
| | * Fix various int size overflows.Stanislav Malyshev2016-09-121-7/+7
| | | | | | | | | | | | | | | Add function for detection of string zvals with length that does not fit INT_MAX.
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-071-6/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
| * | Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1Mitch Hagstrand2017-01-071-6/+6
| | | | | | | | | | | | | | | This reverts commit e55e93a1e335bec39b7edb28f0b8470fa974f4e3. This change should only apply to master. Not PHP-7.0 or PHP-7.1
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-061-6/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Test request47456.phpt for PR 1303
| * | Test request47456.phpt for PR 1303Mitch Hagstrand2017-01-061-6/+6
| | | | | | | | | | | | After merging PR 1303 unmatched subpatterns are set to NULL
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-042-2/+2
| | |
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-042-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-262-5/+32
|\ \ \ | |/ /
| * | Fix #73612: preg_*() may leak memoryChristoph M. Becker2016-11-262-5/+32
| | | | | | | | | | | | | | | We have to make sure that collectible zvals end up in the GC root buffer, to avoid memory leaks.
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-11-202-32/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Fixed bug #73483 (Segmentation fault on pcre_replace_callback)Xinchen Hui2016-11-202-32/+80
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-10-292-0/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Skip if no jit is built
| * | Skip if no jit is builtXinchen Hui2016-10-292-0/+10
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-10-282-5/+31
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #73392 (A use-after-free in zend allocator management)
| * | Fixed bug #73392 (A use-after-free in zend allocator management)Xinchen Hui2016-10-282-5/+31
| | |
| * | rename publicly exposed symbol to avoid name conflictsAnatol Belski2016-10-131-3/+3
| | |
| * | Fix potential overflows in php_pcre_replace_implStanislav Malyshev2016-10-121-18/+16
| | |
* | | Normalize preg_replace_callback() return valueNikita Popov2016-10-152-4/+4
| | | | | | | | | | | | | | | One particular error case was returning the argument without casting to string.
* | | rename publicly exposed symbol to avoid name conflictsAnatol Belski2016-10-141-3/+3
| | | | | | | | | | | | (cherry picked from commit 730288ae41fe0d40d00b27174b558cf260b1a7df)
* | | Fix potential overflows in php_pcre_replace_implStanislav Malyshev2016-10-141-18/+16
| | | | | | | | | | | | (cherry picked from commit 9c50ba42d6503a5fcfffad6c6823a9bee0e033c0)
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-235-11/+39
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
| * | Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390Anatol Belski2016-09-235-11/+39
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Andrea Faulds2016-09-111-58/+0
|\ \ \ | |/ /
| * | Remove zpp fallback code (always use Fast ZPP)Andrea Faulds2016-09-111-58/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c Author: Andrea Faulds <ajf@ajf.me> Date: Sun Sep 11 19:14:37 2016 +0100 Keep dummy FAST_ZPP macro for compatibility commit 8a7cfd00deaa4a3c5026c97580c49c886c72a5b4 Author: Andrea Faulds <ajf@ajf.me> Date: Mon Sep 5 22:36:03 2016 +0100 Remove FAST_ZPP macro and plain zpp fallback code
* | | Merge branch 'pull-request/2115' into PHP-7.1Christoph M. Becker2016-09-062-2/+2
|\ \ \
| * | | Fix #72948: Uncatchable "Catchable" fatal error for class to string conversionsChristoph M. Becker2016-09-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-052-0/+102
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * PHP-7.0: Implement #47456: Missing PCRE option 'J'
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-052-0/+102
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Implement #47456: Missing PCRE option 'J'
| | * Implement #47456: Missing PCRE option 'J'Christoph M. Becker2016-09-052-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-0/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix possible memory leak
| * | fix possible memory leakAnatol Belski2016-08-291-0/+5
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-07-3161-5976/+4238
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: update NEWS Revert "upgraded to PCRE 8.39"
| * | Revert "upgraded to PCRE 8.39"Anatol Belski2016-07-3161-5976/+4238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2fba6468374a15efc82aaac8cbfc600b29c5404f. 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.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-272-1/+18
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-272-1/+18
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/pcre/php_pcre.c
| | * Fix #72688: preg_match missing group names in matchesChristoph M. Becker2016-07-272-1/+18
| | | | | | | | | | | | We have to multiply with 0x100 to properly scale the high byte.
| * | upgraded to PCRE 8.39Anatol Belski2016-07-2661-4238/+5976
| | | | | | | | | | | | (cherry picked from commit 9d4fe9672a1c32d1349f267d24d079e3ebdc83e8)
* | | Merge branch 'PHP-7.0'Matteo Beccati2016-07-062-5/+27
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Rewrite test to avoid sending emails
View Lorry Controller Status