diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-19 15:35:15 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-19 15:35:15 +0100 |
| commit | f53e7394eb61085c09928b47f84123bd90b64dfb (patch) | |
| tree | cd775180bc14b2a85e8a14707261b43040826989 | |
| parent | 2783670daa7831b61937ab91f5d2cd84d63de5fd (diff) | |
| download | php-git-f53e7394eb61085c09928b47f84123bd90b64dfb.tar.gz | |
Respect OFFSET_CAPTURE when padding preg_match_all() results
This issue was mentioned in bug #73948. The PREG_PATTERN_ORDER
padding was performed without respecting the PREF_OFFSET_CAPTURE
flag, which resulted in unmatched subpatterns being either null or
[null, -1] depending on where they occur. Now they will always be
[null, -1], consistent with other usages.
| -rw-r--r-- | ext/pcre/php_pcre.c | 6 | ||||
| -rw-r--r-- | ext/pcre/tests/bug61780_1.phpt | 30 | ||||
| -rw-r--r-- | ext/pcre/tests/bug61780_2.phpt | 60 |
3 files changed, 80 insertions, 16 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 37e0b0c68b..bdc299806c 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1290,7 +1290,11 @@ matched: */ if (count < num_subpats) { for (; i < num_subpats; i++) { - if (unmatched_as_null) { + if (offset_capture) { + add_offset_pair( + &match_sets[i], NULL, 0, PCRE2_UNSET, + NULL, unmatched_as_null); + } else if (unmatched_as_null) { add_next_index_null(&match_sets[i]); } else { add_next_index_str(&match_sets[i], ZSTR_EMPTY_ALLOC()); diff --git a/ext/pcre/tests/bug61780_1.phpt b/ext/pcre/tests/bug61780_1.phpt index dc5806cb30..932f43ffd6 100644 --- a/ext/pcre/tests/bug61780_1.phpt +++ b/ext/pcre/tests/bug61780_1.phpt @@ -95,7 +95,11 @@ array ( ), 1 => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => NULL, @@ -106,18 +110,34 @@ array ( 0 => '4', 1 => 3, ), - 3 => NULL, + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), 2 => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => '2', 1 => 1, ), - 2 => NULL, - 3 => NULL, + 2 => + array ( + 0 => NULL, + 1 => -1, + ), + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), ) diff --git a/ext/pcre/tests/bug61780_2.phpt b/ext/pcre/tests/bug61780_2.phpt index faf44d368b..acc3e96e89 100644 --- a/ext/pcre/tests/bug61780_2.phpt +++ b/ext/pcre/tests/bug61780_2.phpt @@ -121,7 +121,11 @@ array ( ), 'a' => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => NULL, @@ -132,11 +136,19 @@ array ( 0 => '4', 1 => 3, ), - 3 => NULL, + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), 1 => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => NULL, @@ -147,29 +159,57 @@ array ( 0 => '4', 1 => 3, ), - 3 => NULL, + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), 'b' => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => '2', 1 => 1, ), - 2 => NULL, - 3 => NULL, + 2 => + array ( + 0 => NULL, + 1 => -1, + ), + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), 2 => array ( - 0 => NULL, + 0 => + array ( + 0 => NULL, + 1 => -1, + ), 1 => array ( 0 => '2', 1 => 1, ), - 2 => NULL, - 3 => NULL, + 2 => + array ( + 0 => NULL, + 1 => -1, + ), + 3 => + array ( + 0 => NULL, + 1 => -1, + ), ), ) |