diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-03-31 13:31:54 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-03-31 13:31:54 +0200 |
| commit | 88460c017a06ce8865f1adcc8f70e511cf776e06 (patch) | |
| tree | 84b2e4cb6d9acebfbe521d59986505b47f88060f | |
| parent | 0dbb581cf4d7e99cadda368c9edce5a721dc4036 (diff) | |
| download | php-git-88460c017a06ce8865f1adcc8f70e511cf776e06.tar.gz | |
Fix #77827: preg_match does not ignore \r in regex flags
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 1 | ||||
| -rw-r--r-- | ext/pcre/tests/bug77827.phpt | 14 |
3 files changed, 19 insertions, 0 deletions
@@ -10,6 +10,10 @@ PHP NEWS . Fixed bug #72175 (Impossibility of creating multiple connections to Interbase with php 7.x). (Nikita) +- PCRE: + . Fixed bug #77827 (preg_match does not ignore \r in regex flags). (requinix, + cmb) + - phpdbg: . Fixed bug #76801 (too many open files). (alekitto) . Fixed bug #77800 (phpdbg segfaults on listing some conditional breakpoints). diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 4cdd8bf27c..2e827298a9 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -486,6 +486,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) case ' ': case '\n': + case '\r': break; default: diff --git a/ext/pcre/tests/bug77827.phpt b/ext/pcre/tests/bug77827.phpt new file mode 100644 index 0000000000..c8f8c7a16a --- /dev/null +++ b/ext/pcre/tests/bug77827.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #77827 (preg_match does not ignore \r in regex flags) +--FILE-- +<?php +var_dump( + preg_match("/foo/i\r", 'FOO'), + preg_last_error() +); +?> +===DONE=== +--EXPECT-- +int(1) +int(0) +===DONE=== |