com php-src: Avoid some unnecessary mbfl_strlen() calcu lations: ext/mbstring/mbstring.c
| From: | Nikita Popov | Date: | Fri, 28 Jul 2017 10:32:50 +0000 |
| Subject: | com php-src: Avoid some unnecessary mbfl_strlen() calcu lations: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98843@lists.php.net to get a copy of this message | ||
Commit: f56b0afe6eb3ec0dd6ec5ee6ec5cee429e41c7e5
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 26 Jul 2017 22:13:20 +0200
Parents: eacd70f762eee90ebcc2b207cd91c49d23cafc1b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f56b0afe6eb3ec0dd6ec5ee6ec5cee429e41c7e5
Log:
Avoid some unnecessary mbfl_strlen() calculations
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index cb5fb05..0672412 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2372,7 +2372,7 @@ PHP_FUNCTION(mb_strlen)
PHP_FUNCTION(mb_strpos)
{
int reverse = 0;
- zend_long offset = 0, slen;
+ zend_long offset = 0;
mbfl_string haystack, needle;
char *enc_name = NULL;
size_t enc_name_len, n;
@@ -2390,14 +2390,17 @@ PHP_FUNCTION(mb_strpos)
RETURN_FALSE;
}
- slen = mbfl_strlen(&haystack);
- if (offset < 0) {
- offset += slen;
- }
- if (offset < 0 || offset > slen) {
- php_error_docref(NULL, E_WARNING, "Offset not contained in string");
- RETURN_FALSE;
+ if (offset != 0) {
+ size_t slen = mbfl_strlen(&haystack);
+ if (offset < 0) {
+ offset += slen;
+ }
+ if (offset < 0 || offset > slen) {
+ php_error_docref(NULL, E_WARNING, "Offset not contained in string");
+ RETURN_FALSE;
+ }
}
+
if (needle.len == 0) {
php_error_docref(NULL, E_WARNING, "Empty delimiter");
RETURN_FALSE;
@@ -2494,7 +2497,7 @@ PHP_FUNCTION(mb_strrpos)
}
}
- {
+ if (offset != 0) {
size_t haystack_char_len = mbfl_strlen(&haystack);
if ((offset > 0 && offset > haystack_char_len) ||
(offset < 0 && -offset > haystack_char_len)) {
@@ -5399,7 +5402,7 @@ MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t
ol
break;
}
- {
+ if (offset != 0) {
size_t haystack_char_len = mbfl_strlen(&haystack);
if (mode) {