summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-12-26 17:13:21 +0100
committerNikita Popov <nikita.ppv@gmail.com>2018-12-26 17:13:21 +0100
commitfc30c0f7adbddd491266fdbf80427c348d249e01 (patch)
tree03f7b7db09c9e16dd58be8eed9ef51db1a1ecb50 /ext/pcre/php_pcre.c
parente595f5cd8a4a00ca04e36ba1e78f14805dbecead (diff)
parentb1deb98c42328488cfce61d49d9607ed44fff7a4 (diff)
downloadphp-git-fc30c0f7adbddd491266fdbf80427c348d249e01.tar.gz
Merge branch 'PHP-7.3'
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index ff86458fbf..a7c1a93646 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -867,7 +867,7 @@ PHPAPI pcre2_code *pcre_get_compiled_regex(zend_string *regex, uint32_t *capture
pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex);
if (preg_options) {
- *preg_options = pce ? pce->preg_options : 0;
+ *preg_options = 0;
}
if (capture_count) {
*capture_count = pce ? pce->capture_count : 0;
@@ -884,7 +884,7 @@ PHPAPI pcre2_code* pcre_get_compiled_regex_ex(zend_string *regex, uint32_t *capt
pcre_cache_entry * pce = pcre_get_compiled_regex_cache(regex);
if (preg_options) {
- *preg_options = pce ? pce->preg_options : 0;
+ *preg_options = 0;
}
if (compile_options) {
*compile_options = pce ? pce->compile_options : 0;