diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-17 20:15:32 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-17 20:15:32 +0100 |
| commit | 7f51d73bb2aef3fb8b50b6a7e76ebb11f86813fa (patch) | |
| tree | abb31b78ec4ddef3c95f223bc58b1c632e526109 /ext/mbstring/mbstring.c | |
| parent | db72160e5ac2b267b9ffa23ad84e62e609382a44 (diff) | |
| parent | e3b3e6812772f5739641d85a89855c085c32e17f (diff) | |
| download | php-git-7f51d73bb2aef3fb8b50b6a7e76ebb11f86813fa.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 212c8d013f..615381e6c4 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2963,7 +2963,7 @@ PHP_FUNCTION(mb_strimwidth) string.val = (unsigned char *)str; string.len = str_len; - if (from < 0 || from > str_len) { + if (from < 0 || (size_t)from > str_len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Start position is out of range"); RETURN_FALSE; } |