Dmitry Stogov
cfee682802
Fixed possible incorrect "mark" usage
2018-01-09 10:30:00 +03:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Anatol Belski
57f33b4ce2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix yet one data race in PCRE
2017-12-06 16:04:22 +01: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
d4af204637
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix use after free revealed by phpdbg
2017-12-05 18:34:39 +01:00
Anatol Belski
092fd44474
Fix use after free revealed by phpdbg
2017-12-05 18:32:32 +01:00
Anatol Belski
75a2ee7f7b
Fixed bug #75601 Thread race in PCRE JIT support
2017-12-05 17:40:00 +01:00
Anatol Belski
31b2b14a71
Fixed bug #75601 Thread race in PCRE JIT support
2017-12-05 17:38:18 +01:00
Anatol Belski
f6b0d365a7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed #75539 and #74183 - preg_last_error not returning error code after error
2017-11-21 20:11:21 +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
0d13323915
Fix UTF check in pcre_grep
...
In this case it loops through different subjects without looking for sub
matches and matches are done against the same pattern. Thus, don't reset
the UTF check flag but use it to check whether JIT should be used and
otherwise let PCRE to do the job according to what was saved into the
pattern.
2017-11-14 13:49:06 +01:00
Anatol Belski
3c241ea326
Fix uninitialized flag when JIT is disabled
2017-11-14 10:12:55 +01:00
Remi Collet
7c8357929c
Fixed bug #75285i Broken build when system libpcre don't have jit support
...
Detect JIT support in system library,
So --with-pcre-jit is only for bundled library.
2017-09-29 15:47:50 +02:00
Anatol Belski
c3a1cc382a
Revert --with-pcre-valgrind by default in debug build
...
After quite a few people reported this option enabled to be in many cases
not handy by default, it's reverted to no by default everywhere. If enabled,
it requires Valgrind dev packages, where just a few have Valgrind itself
installed or care. Still for PCRE related work this option is a must,
though will have to be turned on by hand.
Revert "fix default args for --with-pcre-valgrind"
This reverts commit 24de0fe9f4
.
Revert "Enable valgrind support for PCRE by default in debug builds"
This reverts commit 850bb998d9
.
2017-09-29 12:17:38 +02:00
Anatol Belski
4f1ea03528
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Apply upstream patch for CVE-2016-1283
2017-09-28 15:45:09 +02: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
Dmitry Stogov
ef90e37bd1
Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after first input string)
2017-08-18 14:56:28 +03:00
Anatol Belski
24de0fe9f4
fix default args for --with-pcre-valgrind
2017-07-13 20:28:10 +02:00
Anatol Belski
850bb998d9
Enable valgrind support for PCRE by default in debug builds
...
Thanks Nikita for the hint.
2017-07-13 18:38:28 +02:00
Anatol Belski
8a287c0ea0
Upgrade bundled PCRE to 8.41
...
HEADSUP! With PCRE 8.39 the JIT related code was changed in the way,
that additional valgrind options became almost unavoidable. Valgrind
had it already sometimes hard with JIT, now there are seem to be more
cases requiring special valgrind options.
For this reason, the new configure option --with-pcre-valgrind was
introduced. The option is development/debugging only and turns on the
Valgrind related pieces in PCRE, so then false positives are avoided
to the big part. In addition, run-tests.php was added a new valgrind
option, when the leak check is enabled and the test filepath contains
pcre.
Thus, to debug the code related to PCRE with JIT enabled, two things
would likely make sense
- configure --with-pcre-valgrind
- valgrind option --smc-check=all if run-tests.php is not used
The checks so far reveal no new issues.
2017-07-11 17:01:59 +02:00
Dmitry Stogov
29653da385
Fixed bug #74873 (Minor BC break: PCRE_JIT changes output of preg_match()).
2017-07-07 09:54:21 +03:00
Stanislav Malyshev
d75dbb0e31
Merge branch 'PHP-7.1'
...
* PHP-7.1:
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:23:16 -07: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
Dmitry Stogov
f626a783b6
Avoid string duplication in preg_split()
2017-06-28 00:43:55 +03:00
Tom Van Looy
04fb3f28ff
Remove superfluous semicolons
2017-06-26 00:23:25 +02:00
Nikita Popov
035a27cbc6
Only compute callback name in error cases
...
Mostly the callback name is only used to report an error. Try to
avoid calculating it if no error occurred.
2017-06-25 18:45:59 +02:00
Dmitry Stogov
71daef93bc
preg_replace() optimization
2017-06-07 13:50:16 +03:00
Dmitry Stogov
81a6ee9aa4
Avoid string reallocations in preg_quote()
2017-06-06 13:56:19 +03:00
Dmitry Stogov
4f947e1f40
PCRE_EXTRA_MARK is useful only for preg_replace_callbakc().
...
Removed branch expectations.
2017-06-02 14:34:31 +03:00
Dmitry Stogov
8dc6b41011
Added support for PCRE JIT fast path API
2017-06-02 13:14:33 +03:00
Dmitry Stogov
32200e0b69
Avoid double copying
2017-05-31 02:14:17 +03:00
Dmitry Stogov
c45e3632a2
Don't allocate empty strings, use single interned string instead.
2017-05-30 10:02:04 +03:00
Remi Collet
cb28a0ab2d
missing fix for test
2017-05-29 11:41:16 +02:00
Nicolas Grekas
3c43510b19
add PREG_UNMATCHED_AS_NULL flag to allow distinguish between unmatched subpatterns and empty matches
2017-05-29 11:40:29 +02:00
Dmitry Stogov
dd4a78b631
Don't separate output arguments
2017-05-23 17:18:05 +03:00
Nikita Popov
06a0340162
Deprecate each()
2017-02-03 21:02:52 +01:00
Nikita Popov
eaeecc523b
Deprecate create_function()
2017-02-03 18:52:57 +01: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
Christoph M. Becker
cba33121f2
Fix test case
...
Unmatched subpatterns are reported as NULL as of commit ee6aaee8
, so we
adjust the test accordingly.
2017-01-06 11:50:30 +01:00
Joe Watkins
ee6aaee83a
Merge branch 'pull-request/1303'
...
* pull-request/1303:
Distinguish between unmatched subpatterns and empty matches in preg_*()
news entry for PR #1303
2017-01-06 05:48:31 +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
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00