From 2503a4b0dd3d61960e14422ffceb524f939899ff Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Sat, 22 Feb 2020 02:16:38 +0100 Subject: [PATCH 1/2] Change oniguruma values from size_t to ptrdiff_t as that's what they return --- ext/mbstring/php_mbregex.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 8de9d2d30203f..e66239e110139 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1390,7 +1390,8 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) char *arg_pattern = NULL, *arg_options = NULL; size_t arg_pattern_len, arg_options_len; int err; - size_t n, i, pos, len, beg, end; + size_t n, i, pos, len; + ptrdiff_t beg, end; OnigOptionType option; OnigUChar *str; OnigSyntaxType *syntax; @@ -1585,7 +1586,8 @@ PHP_FUNCTION(mb_ereg_search_init) Get matched substring of the last time */ PHP_FUNCTION(mb_ereg_search_getregs) { - size_t n, i, len, beg, end; + size_t n, i, len; + ptrdiff_t beg, end; OnigUChar *str; if (zend_parse_parameters_none() == FAILURE) { From e36b81bbb4cb9702cd97787c73749d6b5ee1e1a5 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 26 Feb 2020 03:05:03 +0100 Subject: [PATCH 2/2] Change do int --- ext/mbstring/php_mbregex.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index e66239e110139..ceda96398ea65 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1391,7 +1391,8 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) size_t arg_pattern_len, arg_options_len; int err; size_t n, i, pos, len; - ptrdiff_t beg, end; + /* Stored as int* in the OnigRegion struct */ + int beg, end; OnigOptionType option; OnigUChar *str; OnigSyntaxType *syntax; @@ -1587,7 +1588,8 @@ PHP_FUNCTION(mb_ereg_search_init) PHP_FUNCTION(mb_ereg_search_getregs) { size_t n, i, len; - ptrdiff_t beg, end; + /* Stored as int* in the OnigRegion struct */ + int beg, end; OnigUChar *str; if (zend_parse_parameters_none() == FAILURE) {