summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
Commit message (Collapse)AuthorAgeFilesLines
* year++Xinchen Hui2018-01-021-1/+1
|
* 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-211-0/+8
|\ | | | | | | | | * 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-211-0/+8
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-11-261-5/+5
|\ \ | |/
| * Fix #73612: preg_*() may leak memoryChristoph M. Becker2016-11-261-5/+5
| | | | | | | | | | 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-201-32/+65
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-201-32/+65
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-10-281-5/+3
|\ \ | |/ | | | | | | * 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-281-5/+3
| |
| * 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-151-1/+1
| | | | | | | | | | 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-231-9/+15
|\ \ | |/ | | | | | | * 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-231-9/+15
| |
* | 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 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-051-0/+1
|\ \ | |/ | | | | | | * PHP-7.0: Implement #47456: Missing PCRE option 'J'
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-051-0/+1
| |\ | | | | | | | | | | | | * PHP-5.6: Implement #47456: Missing PCRE option 'J'
| | * Implement #47456: Missing PCRE option 'J'Christoph M. Becker2016-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.1Christoph M. Becker2016-07-271-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-271-1/+1
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/pcre/php_pcre.c
| | * Fix #72688: preg_match missing group names in matchesChristoph M. Becker2016-07-271-1/+1
| | | | | | | | | | | | We have to multiply with 0x100 to properly scale the high byte.
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-06-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72476 (Memleak in jit_stack)
| * | Fixed bug #72476 (Memleak in jit_stack)Xinchen Hui2016-06-231-1/+1
| | |
* | | Merge branch 'PHP-7.0'Anatol Belski2016-06-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72463 mail fails with invalid argument
| * | Fixed bug #72463 mail fails with invalid argumentAnatol Belski2016-06-221-1/+1
| | |
| * | Revert "Revert "fix #72143 (preg_replace uses int instead of size_t on ↵Xinchen Hui2016-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | zend_string_allocs)"" obviously I read the change is in argument lists by mistake :< This reverts commit 9e7afa75140afd047cb95280a610cff9368a7517.
| * | Revert "fix #72143 (preg_replace uses int instead of size_t on ↵Xinchen Hui2016-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | zend_string_allocs)" ABI break This reverts commit fb951553be0175712f4b757e05004110d7421e04.
| * | fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)Joe Watkins2016-05-141-2/+2
| | |
* | | fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)Joe Watkins2016-05-141-2/+2
| | |
* | | Simplified conditionDmitry Stogov2016-04-291-1/+1
|/ /
* | if there's no JIT support, no RINIT is really neededAnatol Belski2016-03-221-2/+6
| |
* | decrease the default PCRE JIT stack to 64KAnatol Belski2016-03-211-1/+1
| |
* | Increase PCRE JIT stack sizeAnatol Belski2016-03-211-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is done by implementing the custom stack usage. This makes the JIT with mode on more compatible with the JIT mode off. Until now, the default PCRE JIT stack was used which is 32kb big by default. There are situations where some patterns would fail with JIT while working correctly without JIT. The starting size of the JIT stack is still set to 32kb, while the max is set to the permissive 256kb (and can be increased up to 1mb). As until now no suchlike bugs regarding JIT were reported, it is expected, that the stack usage will stay by 32kb in most cases. Though providing the custom stack, applications will have more room for some sporadic stack increase, thus more compatibility.
* | Fix bug #71659Nikita Popov2016-03-091-24/+4
| |
* | Fixed bug #71537 (PCRE segfault from Opcache)Xinchen Hui2016-02-071-6/+8
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-09-011-1/+1
| |\ | | | | | | | | | | | | * PHP-5.5: More fixes for bug #70219
| | * Merge branch 'PHP-5.4.45' into PHP-5.5.29Stanislav Malyshev2015-09-011-74/+74
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.45: add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c
* | | | Fixed bug #71178 (preg_replace with arrays creates [0] in replace array if ↵Xinchen Hui2015-12-211-1/+1
| | | | | | | | | | | | | | | | not already set)
View Lorry Controller Status