diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-30 15:02:14 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-30 15:12:49 +0200 |
| commit | ecdef60d000210f4d22e95de4209db73a0c8344f (patch) | |
| tree | 128b7aad1e4cdffd6bd67f3e12cf7441d2fe4eb0 /ext/mbstring/mbstring.c | |
| parent | 3d66d56c1d0d1185851eeefacfb4ffb581ce8a24 (diff) | |
| parent | 972302d2f0bb12689db280df8a3daadb0d5003b3 (diff) | |
| download | php-git-ecdef60d000210f4d22e95de4209db73a0c8344f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index a44a9dade1..1ddc5ffd02 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2934,6 +2934,13 @@ PHP_FUNCTION(mb_substr) RETURN_FALSE; } + if (from > INT_MAX) { + from = INT_MAX; + } + if (len > INT_MAX) { + len = INT_MAX; + } + ret = mbfl_substr(&string, &result, from, len); if (NULL == ret) { RETURN_FALSE; |