From f53e7394eb61085c09928b47f84123bd90b64dfb Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 19 Mar 2019 15:35:15 +0100 Subject: 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. --- ext/pcre/php_pcre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ext/pcre/php_pcre.c') 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()); -- cgit v1.2.1